X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStation.ts;h=9f1fa7dea8b29435e63592b2645406613d7a1526;hb=7436ee0df05bb41f3ce8a553adf5d9ed8da78903;hp=9855c8cabdab3fca7242f5122a99ca99831b2cc9;hpb=1227a6f190a8020afd953a26bdede86e5f04eb0c;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts index 9855c8ca..9f1fa7de 100644 --- a/src/charging-station/ChargingStation.ts +++ b/src/charging-station/ChargingStation.ts @@ -185,8 +185,9 @@ export class ChargingStation { }; public hasIdTags(): boolean { - const idTagsFile = ChargingStationUtils.getIdTagsFile(this.stationInfo); - return Utils.isNotEmptyArray(this.idTagsCache.getIdTags(idTagsFile)); + return Utils.isNotEmptyArray( + this.idTagsCache.getIdTags(ChargingStationUtils.getIdTagsFile(this.stationInfo)) + ); } public getEnableStatistics(): boolean { @@ -1594,9 +1595,7 @@ export class ChargingStation { .update(JSON.stringify(configurationData)) .digest('hex'); if (this.configurationFileHash !== configurationHash) { - const asyncLock = AsyncLock.getInstance(AsyncLockType.configuration); - asyncLock - .acquire() + AsyncLock.acquire(AsyncLockType.configuration) .then(() => { configurationData.configurationHash = configurationHash; const measureId = `${FileType.ChargingStationConfiguration} write`; @@ -1618,7 +1617,7 @@ export class ChargingStation { ); }) .finally(() => { - asyncLock.release().catch(Constants.EMPTY_FUNCTION); + AsyncLock.release(AsyncLockType.configuration).catch(Constants.EMPTY_FUNCTION); }); } else { logger.debug( @@ -2040,7 +2039,8 @@ export class ChargingStation { await OCPPServiceUtils.sendAndSetConnectorStatus( this, connectorId, - connectorBootStatus + connectorBootStatus, + evseId ); } } @@ -2100,7 +2100,8 @@ export class ChargingStation { OCPPServiceUtils.buildStatusNotificationRequest( this, connectorId, - ConnectorStatusEnum.Unavailable + ConnectorStatusEnum.Unavailable, + evseId ) ); delete connectorStatus?.status;