Vue UI + UI server

[e-mobility-charging-stations-simulator.git] / src / charging-station / ui-server / UIWebSocketServer.ts

diff --git a/src/charging-station/ui-server/UIWebSocketServer.ts b/src/charging-station/ui-server/UIWebSocketServer.ts
index ad3847790149823eb9859474b165ab0e878aa389..d75b9ab8e860a6748b26077c88f4913a06c33a48 100644 (file)
--- a/src/charging-station/ui-server/UIWebSocketServer.ts
+++ b/src/charging-station/ui-server/UIWebSocketServer.ts
@@ -10,6 +10,8 @@ import Utils from '../../utils/Utils';
 import { AbstractUIServer } from './AbstractUIServer';
 import UIServiceFactory from './ui-services/UIServiceFactory';
 
+const moduleName = 'UIWebSocketServer';
+
 export default class UIWebSocketServer extends AbstractUIServer {
   public constructor(options?: ServerOptions) {
     super();
@@ -30,12 +32,21 @@ export default class UIWebSocketServer extends AbstractUIServer {
         this.uiServices
           .get(version)
           .messageHandler(messageData)
-          .catch(() => {
-            logger.error(`${this.logPrefix()} Error while handling message data: %j`, messageData);
+          .catch((error) => {
+            logger.error(
+              `${this.logPrefix(
+                moduleName,
+                'start.socket.onmessage'
+              )} Error while handling message:`,
+              error
+            );
           });
       });
       socket.on('error', (error) => {
-        logger.error(`${this.logPrefix()} Error on WebSocket: %j`, error);
+        logger.error(
+          `${this.logPrefix(moduleName, 'start.socket.onerror')} Error on WebSocket:`,
+          error
+        );
       });
     });
   }
@@ -48,8 +59,12 @@ export default class UIWebSocketServer extends AbstractUIServer {
     this.broadcastToClients(message);
   }
 
-  public logPrefix(): string {
-    return Utils.logPrefix(' UI WebSocket Server:');
+  public logPrefix(modName?: string, methodName?: string): string {
+    const logMsg =
+      modName && methodName
+        ? ` UI WebSocket Server | ${modName}.${methodName}:`
+        : ' UI WebSocket Server |';
+    return Utils.logPrefix(logMsg);
   }
 
   private broadcastToClients(message: string): void {