Refine UI WS service log messages

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/src/charging-station/UIWebSocketServer.ts b/src/charging-station/UIWebSocketServer.ts
index 78ca7516b89a07d53ee59f78e36e0d6ba5162098..f941b138d505540f3fa3c12bee916ffda4e28ec8 100644 (file)
--- a/src/charging-station/UIWebSocketServer.ts
+++ b/src/charging-station/UIWebSocketServer.ts
@@ -30,7 +30,7 @@ export default class UIWebSocketServer extends WebSocket.Server {
       const version = socket.protocol.substring(protocolIndex + Protocol.UI.length) as ProtocolVersion;
       this.uiService = UIServiceFactory.getUIServiceImplementation(version, this);
       if (!this.uiService) {
-        throw new BaseError(`Could not find a UI service implementation for protocol version ${version}`);
+        throw new BaseError(`Could not find a UI service implementation for UI protocol version ${version}`);
       }
       // FIXME: check connection validity
       socket.on('message', (messageData) => {
@@ -39,7 +39,7 @@ export default class UIWebSocketServer extends WebSocket.Server {
         if (Utils.isIterable(protocolRequest)) {
           [command, payload] = protocolRequest;
         } else {
-          throw new BaseError('Protocol request is not iterable');
+          throw new BaseError('UI protocol request is not iterable');
         }
         this.uiService.handleMessage(command, payload).catch(() => {
           logger.error(`${this.logPrefix()} Error while handling command %s message: %j`, command, payload);
@@ -56,6 +56,6 @@ export default class UIWebSocketServer extends WebSocket.Server {
   }
 
   public logPrefix(): string {
-    return Utils.logPrefix('WebSocket Server:');
+    return Utils.logPrefix(' UI WebSocket Server:');
   }
 }

diff --git a/src/charging-station/UIWebSocketServices/AbstractUIService.ts b/src/charging-station/UIWebSocketServices/AbstractUIService.ts
index fafcdb6d5e12d2e8c330e40ea5f737043de4fc32..a817c859571390b1c8af023b0278462877e7b835 100644 (file)
--- a/src/charging-station/UIWebSocketServices/AbstractUIService.ts
+++ b/src/charging-station/UIWebSocketServices/AbstractUIService.ts
@@ -12,7 +12,6 @@ export default abstract class AbstractUIService {
   constructor(uiWebSocketServer: UIWebSocketServer) {
     this.chargingStations = new Set<string>();
     this.uiWebSocketServer = uiWebSocketServer;
-    // TODO: Move the shared service code to AbstractUIService
     this.messageHandlers = new Map<ProtocolCommand, ProtocolRequestHandler>([
       [ProtocolCommand.LIST_CHARGING_STATIONS, this.handleListChargingStations.bind(this)],
     ]);

diff --git a/src/charging-station/UIWebSocketServices/UIServiceUtils.ts b/src/charging-station/UIWebSocketServices/UIServiceUtils.ts
index f95a748563df725fc1963c016ff2d2eac23f41c7..2c37e80a4f9b2cc743a7b468b0d96fa9d284290b 100644 (file)
--- a/src/charging-station/UIWebSocketServices/UIServiceUtils.ts
+++ b/src/charging-station/UIWebSocketServices/UIServiceUtils.ts
@@ -17,7 +17,7 @@ export class UIServiceUtils {
         return fullProtocol;
       }
     }
-    logger.error(`${Utils.logPrefix('WebSocket Server:')} Unsupported protocol: ${protocol} or protocol version: ${version}`);
+    logger.error(`${Utils.logPrefix(' UI WebSocket Server:')} Unsupported protocol: ${protocol} or protocol version: ${version}`);
     return false;
   };
 }