From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Wed, 5 Jun 2024 14:30:29 +0000 (+0200)
Subject: fix: fix error handling default options definition
X-Git-Tag: v1.3.4~22
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=30695dcf67470f149e349d196b3d016482d11a17;p=e-mobility-charging-stations-simulator.git

fix: fix error handling default options definition

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

diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
index 7c88547a..b8a18463 100644
--- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts
+++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
@@ -56,11 +56,12 @@ export abstract class OCPPIncomingRequestService extends EventEmitter {
     error: Error,
     params: HandleErrorParams<T> = { throwError: true, consoleOut: false }
   ): T | undefined {
-    setDefaultErrorParams(params)
+    params = setDefaultErrorParams(params)
     logger.error(
       `${chargingStation.logPrefix()} ${moduleName}.handleIncomingRequestError: Incoming request command '${commandName}' error:`,
       error
     )
+    console.error('params set', params)
     if (params.throwError === false && params.errorResponse != null) {
       return params.errorResponse
     }
diff --git a/src/performance/storage/Storage.ts b/src/performance/storage/Storage.ts
index 46a3a6db..bdf7acb1 100644
--- a/src/performance/storage/Storage.ts
+++ b/src/performance/storage/Storage.ts
@@ -31,7 +31,7 @@ export abstract class Storage {
       consoleOut: false
     }
   ): void {
-    setDefaultErrorParams(params, { throwError: false, consoleOut: false })
+    params = setDefaultErrorParams(params, { throwError: false, consoleOut: false })
     const inTableOrCollectionStr = table != null && ` in table or collection '${table}'`
     logger.error(
       `${this.logPrefix} ${this.getDBNameFromStorageType(type)} error '${
diff --git a/src/utils/ErrorUtils.ts b/src/utils/ErrorUtils.ts
index f74c48e8..fb23b133 100644
--- a/src/utils/ErrorUtils.ts
+++ b/src/utils/ErrorUtils.ts
@@ -40,7 +40,7 @@ export const handleFileException = (
   logPrefix: string,
   params: HandleErrorParams<EmptyObject> = defaultErrorParams
 ): void => {
-  setDefaultErrorParams(params)
+  params = setDefaultErrorParams(params)
   const prefix = isNotEmptyString(logPrefix) ? `${logPrefix} ` : ''
   let logMsg: string
   switch (error.code) {
@@ -88,7 +88,7 @@ export const handleSendMessageError = (
     consoleOut: false
   }
 ): void => {
-  setDefaultErrorParams(params, { throwError: false, consoleOut: false })
+  params = setDefaultErrorParams(params, { throwError: false, consoleOut: false })
   logger.error(
     `${chargingStation.logPrefix()} Send ${getMessageTypeString(messageType)} command '${commandName}' error:`,
     error
@@ -102,6 +102,5 @@ export const setDefaultErrorParams = <T extends JsonType>(
   params: HandleErrorParams<T>,
   defaultParams: HandleErrorParams<T> = defaultErrorParams
 ): HandleErrorParams<T> => {
-  params = { ...defaultParams, ...params }
-  return params
+  return { ...defaultParams, ...params }
 }