X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=a982cb694f04844a55a0ff213ab3a17782f13400;hb=821c6c8229d6dfdc93ce917dfaad74e681e5a35c;hp=89f81e75aff572dfdb9425df1d69a5f0990d70d2;hpb=689dca78d8b50e58be603005695da60ae3070544;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts index 89f81e75..a982cb69 100644 --- a/src/charging-station/Bootstrap.ts +++ b/src/charging-station/Bootstrap.ts @@ -1,4 +1,4 @@ -import { ChargingStationWorkerData, WorkerEvents, WorkerMessage } from '../types/Worker'; +import { ChargingStationWorkerData, WorkerMessage, WorkerMessageEvents } from '../types/Worker'; import Configuration from '../utils/Configuration'; import { Storage } from '../utils/performance-storage/Storage'; @@ -38,6 +38,7 @@ export default class Bootstrap { if (isMainThread && !this.started) { try { let numStationsTotal = 0; + await Bootstrap.storage.open(); await Bootstrap.workerImplementation.start(); // Start ChargingStation object in worker thread if (Configuration.getStationTemplateURLs()) { @@ -74,6 +75,7 @@ export default class Bootstrap { public async stop(): Promise { if (isMainThread && this.started) { await Bootstrap.workerImplementation.stop(); + await Bootstrap.storage.close(); } this.started = false; } @@ -84,7 +86,7 @@ export default class Bootstrap { await this.start(); } - private initWorkerImplementation() { + private initWorkerImplementation(): void { Bootstrap.workerImplementation = WorkerFactory.getWorkerImplementation(this.workerScript, Configuration.getWorkerProcess(), { startDelay: Configuration.getWorkerStartDelay(), @@ -93,10 +95,11 @@ export default class Bootstrap { elementsPerWorker: Configuration.getChargingStationsPerWorker(), poolOptions: { workerChoiceStrategy: Configuration.getWorkerPoolStrategy() - } - }, (msg: WorkerMessage) => { - if (msg.id === WorkerEvents.PERFORMANCE_STATISTICS) { - Bootstrap.storage.storePerformanceStatistics(msg.data); + }, + messageHandler: async (msg: WorkerMessage) => { + if (msg.id === WorkerMessageEvents.PERFORMANCE_STATISTICS) { + await Bootstrap.storage.storePerformanceStatistics(msg.data); + } } }); }