From 13cddb909eccc96060b5051fb509d9f14d14ca4b Mon Sep 17 00:00:00 2001 From: Martin Karkowski Date: Thu, 4 Mar 2021 12:33:53 +0100 Subject: [PATCH] Fixing Layers --- lib/communication/IoSocketClient.ts | 4 ++-- lib/communication/IoSocketServer.ts | 6 +++--- lib/communication/debugEventLayer.ts | 4 ++-- modules/helloworld/src/helloworld.package.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/communication/IoSocketClient.ts b/lib/communication/IoSocketClient.ts index 7044ef1..37b277b 100644 --- a/lib/communication/IoSocketClient.ts +++ b/lib/communication/IoSocketClient.ts @@ -2,7 +2,7 @@ * @author Martin Karkowski * @email m.karkowski@zema.de * @create date 2020-11-04 17:36:04 - * @modify date 2021-03-01 17:20:03 + * @modify date 2021-03-01 17:41:45 * @desc [description] */ @@ -59,7 +59,7 @@ export class IoSocketClient extends Bridge implements ICommunicationInterface { new EventEmitter(), "individual", "individual", - getNopeLogger("io-socket-server-internal") + this._logger ), false, true diff --git a/lib/communication/IoSocketServer.ts b/lib/communication/IoSocketServer.ts index 4e667c7..6ba11d2 100644 --- a/lib/communication/IoSocketServer.ts +++ b/lib/communication/IoSocketServer.ts @@ -2,7 +2,7 @@ * @author Martin Karkowski * @email m.karkowski@zema.de * @create date 2020-11-06 08:52:42 - * @modify date 2021-03-01 17:17:56 + * @modify date 2021-03-01 17:43:12 * @desc [description] */ @@ -46,7 +46,7 @@ export class IoSocketServer extends Bridge { // Add a default Event-Layer // Perhaps that can be removed. - this.addLayer(new DebuggedEventLayer(new EventEmitter(), "individual","individual",getNopeLogger("io-socket-server-internal", "debug")),false, true); + this.addLayer(new DebuggedEventLayer(new EventEmitter(), "individual","individual",null),false, true); this._logger.info( "waiting for connection. Listening on port: " + port.toString() @@ -61,7 +61,7 @@ export class IoSocketServer extends Bridge { _this._sockets.add(client); // Add the socket as new layer: - const _layer = new DebuggedEventLayer(client, "individual","individual", getNopeLogger("io-client-" + client.id, "debug")); + const _layer = new DebuggedEventLayer(client, "individual","individual", getNopeLogger("io-client-" + client.id, "info")); _this.addLayer(_layer, true); // Subscribe to Loosing connection: diff --git a/lib/communication/debugEventLayer.ts b/lib/communication/debugEventLayer.ts index 8260d99..5285ab0 100644 --- a/lib/communication/debugEventLayer.ts +++ b/lib/communication/debugEventLayer.ts @@ -2,7 +2,7 @@ * @author Martin Karkowski * @email m.karkowski@zema.de * @create date 2021-03-01 15:05:09 - * @modify date 2021-03-01 17:20:19 + * @modify date 2021-03-01 17:42:12 * @desc [description] */ import { EventEmitter } from "events"; @@ -25,7 +25,7 @@ export class DebuggedEventLayer extends EventLayer { _emitter: IEmitter = new EventEmitter(), subscriptionMode: "individual" | "generic" = "individual", resultSharing: "individual" | "generic" = "individual", - _logger = getNopeLogger("debug-layer", "debug") + _logger = getNopeLogger("debug-layer", "info") ) { super(_emitter,subscriptionMode,resultSharing,_logger); diff --git a/modules/helloworld/src/helloworld.package.ts b/modules/helloworld/src/helloworld.package.ts index 2aa71ef..f17c996 100644 --- a/modules/helloworld/src/helloworld.package.ts +++ b/modules/helloworld/src/helloworld.package.ts @@ -2,7 +2,7 @@ * @author Martin Karkowski * @email m.karkowski@zema.de * @create date 2020-11-06 16:53:43 - * @modify date 2020-12-30 18:37:18 + * @modify date 2021-03-01 17:38:11 * @desc [description] */ @@ -30,7 +30,7 @@ export const DESCRIPTION: IPackageDescription = { providedClasses: [ { description: { - name: "helloworld", + name: HelloWorldModuleWithDecorators.prototype.constructor.name.toString(), selector: TYPES.helloworld, type: HelloWorldModuleWithDecorators },