X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2FOCPPServiceUtils.ts;h=3fced606ba29e6b003aa1b16c0bafdcb4a3f533e;hb=53ac516c575adaacd199a68d39b5ace22876ee83;hp=6d21182891224ec436dba3946993b776d3cc6eb4;hpb=8b7072dca602c80ec6ef9a3463b6d53b43aa8fa5;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ocpp/OCPPServiceUtils.ts b/src/charging-station/ocpp/OCPPServiceUtils.ts
index 6d211828..3fced606 100644
--- a/src/charging-station/ocpp/OCPPServiceUtils.ts
+++ b/src/charging-station/ocpp/OCPPServiceUtils.ts
@@ -170,7 +170,9 @@ export class OCPPServiceUtils {
 
   protected static parseJsonSchemaFile<T extends JsonType>(
     filePath: string,
-    ocppVersion: OCPPVersion
+    ocppVersion: OCPPVersion,
+    moduleName?: string,
+    methodName?: string
   ): JSONSchemaType<T> {
     try {
       return JSON.parse(fs.readFileSync(filePath, 'utf8')) as JSONSchemaType<T>;
@@ -179,7 +181,7 @@ export class OCPPServiceUtils {
         filePath,
         FileType.JsonSchema,
         error as NodeJS.ErrnoException,
-        OCPPServiceUtils.logPrefix(ocppVersion),
+        OCPPServiceUtils.logPrefix(ocppVersion, moduleName, methodName),
         { throwError: false }
       );
     }
@@ -216,7 +218,7 @@ export class OCPPServiceUtils {
       chargingStation.getConnectorStatus(connectorId)?.MeterValues;
     for (
       let index = 0;
-      Utils.isEmptyArray(sampledValueTemplates) === false && index < sampledValueTemplates.length;
+      Utils.isNotEmptyArray(sampledValueTemplates) === true && index < sampledValueTemplates.length;
       index++
     ) {
       if (
@@ -283,7 +285,15 @@ export class OCPPServiceUtils {
       : numberValue * options.unitMultiplier;
   }
 
-  private static logPrefix = (ocppVersion: OCPPVersion): string => {
-    return Utils.logPrefix(` OCPP ${ocppVersion} |`);
+  private static logPrefix = (
+    ocppVersion: OCPPVersion,
+    moduleName?: string,
+    methodName?: string
+  ): string => {
+    const logMsg =
+      Utils.isNotEmptyString(moduleName) && Utils.isNotEmptyString(methodName)
+        ? ` OCPP ${ocppVersion} | ${moduleName}.${methodName}:`
+        : ` OCPP ${ocppVersion} |`;
+    return Utils.logPrefix(logMsg);
   };
 }