repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refine README.md
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ChargingStation.ts
diff --git
a/src/charging-station/ChargingStation.ts
b/src/charging-station/ChargingStation.ts
index 63574b5c617ed3915bf7e4bdfe6fbc9edcf1d8bf..d7dcdceec9428543c5957738912b541a61d47ddd 100644
(file)
--- a/
src/charging-station/ChargingStation.ts
+++ b/
src/charging-station/ChargingStation.ts
@@
-3,7
+3,7
@@
import crypto from 'crypto';
import fs from 'fs';
import path from 'path';
import crypto from 'crypto';
import fs from 'fs';
import path from 'path';
-import { URL
, fileURLToPath
} from 'url';
+import { URL } from 'url';
import { parentPort } from 'worker_threads';
import WebSocket, { Data, RawData } from 'ws';
import { parentPort } from 'worker_threads';
import WebSocket, { Data, RawData } from 'ws';
@@
-861,9
+861,7
@@
export default class ChargingStation {
this.hashId = ChargingStationUtils.getHashId(this.index, this.getTemplateFromFile());
logger.info(`${this.logPrefix()} Charging station hashId '${this.hashId}'`);
this.configurationFile = path.join(
this.hashId = ChargingStationUtils.getHashId(this.index, this.getTemplateFromFile());
logger.info(`${this.logPrefix()} Charging station hashId '${this.hashId}'`);
this.configurationFile = path.join(
- path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../'),
- 'assets',
- 'configurations',
+ path.dirname(this.templateFile.replace('station-templates', 'configurations')),
this.hashId + '.json'
);
this.stationInfo = this.getStationInfo();
this.hashId + '.json'
);
this.stationInfo = this.getStationInfo();
@@
-1450,12
+1448,22
@@
export default class ChargingStation {
} catch (error) {
// Log
logger.error(
} catch (error) {
// Log
logger.error(
-
'%s Incoming OCPP message %j matching cached request %j processing error %j'
,
+
"%s Incoming OCPP '%s' message '%j' matching cached request '%j' processing error: %j"
,
this.logPrefix(),
this.logPrefix(),
+ commandName ?? requestCommandName ?? null,
data.toString(),
this.requests.get(messageId),
error
);
data.toString(),
this.requests.get(messageId),
error
);
+ if (!(error instanceof OCPPError)) {
+ logger.warn(
+ "%s Error thrown at incoming OCPP '%s' message '%j' handling is not an OCPPError: %j",
+ this.logPrefix(),
+ commandName ?? requestCommandName ?? null,
+ data.toString(),
+ error
+ );
+ }
// Send error
messageType === MessageType.CALL_MESSAGE &&
(await this.ocppRequestService.sendError(
// Send error
messageType === MessageType.CALL_MESSAGE &&
(await this.ocppRequestService.sendError(