From: Jérôme Benoit Date: Mon, 10 Nov 2025 15:27:00 +0000 (+0100) Subject: chore: cleanup logging code X-Git-Tag: ocpp-server@v2.2.0~52^2~5 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=79f8627c570c48269871062ba2d429c39743c51a;p=e-mobility-charging-stations-simulator.git chore: cleanup logging code Signed-off-by: Jérôme Benoit --- diff --git a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts index cc63df8e..e07e9791 100644 --- a/src/charging-station/ocpp/1.6/OCPP16RequestService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16RequestService.ts @@ -109,29 +109,20 @@ export class OCPP16RequestService extends OCPPRequestService { let connectorId: number | undefined let energyActiveImportRegister: number commandParams = commandParams as JsonObject + logger.debug( + `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${commandName} payload` + ) switch (commandName) { case OCPP16RequestCommand.AUTHORIZE: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP16RequestCommand.AUTHORIZE} payload with default idTag` - ) return { idTag: Constants.DEFAULT_IDTAG, ...commandParams, } as unknown as Request case OCPP16RequestCommand.BOOT_NOTIFICATION: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP16RequestCommand.BOOT_NOTIFICATION} payload` - ) return commandParams as unknown as Request case OCPP16RequestCommand.DATA_TRANSFER: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP16RequestCommand.DATA_TRANSFER} payload` - ) return commandParams as unknown as Request case OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION} payload` - ) return commandParams as unknown as Request case OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION: logger.debug( @@ -139,19 +130,10 @@ export class OCPP16RequestService extends OCPPRequestService { ) return commandParams as unknown as Request case OCPP16RequestCommand.HEARTBEAT: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP16RequestCommand.HEARTBEAT} payload (empty)` - ) return OCPP16Constants.OCPP_REQUEST_EMPTY as unknown as Request case OCPP16RequestCommand.METER_VALUES: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP16RequestCommand.METER_VALUES} payload` - ) return commandParams as unknown as Request case OCPP16RequestCommand.START_TRANSACTION: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP16RequestCommand.START_TRANSACTION} payload with meter start and timestamp` - ) return { idTag: Constants.DEFAULT_IDTAG, meterStart: chargingStation.getEnergyActiveImportRegisterByConnectorId( @@ -175,14 +157,8 @@ export class OCPP16RequestService extends OCPPRequestService { ...commandParams, } as unknown as Request case OCPP16RequestCommand.STATUS_NOTIFICATION: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP16RequestCommand.STATUS_NOTIFICATION} payload` - ) return commandParams as unknown as Request case OCPP16RequestCommand.STOP_TRANSACTION: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP16RequestCommand.STOP_TRANSACTION} payload with meter stop and timestamp` - ) chargingStation.stationInfo?.transactionDataMeterValues === true && (connectorId = chargingStation.getConnectorIdByTransactionId( commandParams.transactionId as number diff --git a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts index b598efb2..155b4c78 100644 --- a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts +++ b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts @@ -95,28 +95,19 @@ export class OCPP20RequestService extends OCPPRequestService { commandParams?: JsonType ): Request { commandParams = commandParams as JsonObject + logger.debug( + `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${commandName} payload` + ) switch (commandName) { case OCPP20RequestCommand.BOOT_NOTIFICATION: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP20RequestCommand.BOOT_NOTIFICATION} payload` - ) return commandParams as unknown as Request case OCPP20RequestCommand.HEARTBEAT: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP20RequestCommand.HEARTBEAT} payload (empty)` - ) return OCPP20Constants.OCPP_RESPONSE_EMPTY as unknown as Request case OCPP20RequestCommand.NOTIFY_REPORT: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP20RequestCommand.NOTIFY_REPORT} payload` - ) return { ...commandParams, } as unknown as Request case OCPP20RequestCommand.STATUS_NOTIFICATION: - logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.buildRequestPayload: Building ${OCPP20RequestCommand.STATUS_NOTIFICATION} payload with timestamp` - ) return { timestamp: new Date(), ...commandParams,