X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=f33116726b318a85712b91e6b213f5b4634a87d4;hb=312ff77c62c6ba96ec1266a5d617b6910511f1c6;hp=5c899d5c381220d3657e5c566e08abaf886aed52;hpb=fb226c9b812c3db625996c5fe29c667be15c388c;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index 5c899d5c..f3311672 100644
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -1,8 +1,10 @@
-import { ChargingStationWorkerData, WorkerEvents, WorkerMessage } from '../types/Worker';
+// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+
+import { ChargingStationWorkerData, WorkerMessage, WorkerMessageEvents } from '../types/Worker';
 
 import Configuration from '../utils/Configuration';
-import { Storage } from '../utils/performance-storage/Storage';
-import { StorageFactory } from '../utils/performance-storage/StorageFactory';
+import { Storage } from '../performance/storage/Storage';
+import { StorageFactory } from '../performance/storage/StorageFactory';
 import Utils from '../utils/Utils';
 import WorkerAbstract from '../worker/WorkerAbstract';
 import WorkerFactory from '../worker/WorkerFactory';
@@ -38,6 +40,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 +77,7 @@ export default class Bootstrap {
   public async stop(): Promise<void> {
     if (isMainThread && this.started) {
       await Bootstrap.workerImplementation.stop();
+      await Bootstrap.storage.close();
     }
     this.started = false;
   }
@@ -84,7 +88,7 @@ export default class Bootstrap {
     await this.start();
   }
 
-  private initWorkerImplementation() {
+  private initWorkerImplementation(): void {
     Bootstrap.workerImplementation = WorkerFactory.getWorkerImplementation<ChargingStationWorkerData>(this.workerScript, Configuration.getWorkerProcess(),
       {
         startDelay: Configuration.getWorkerStartDelay(),
@@ -93,15 +97,16 @@ 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);
+          }
         }
       });
   }
 
   private logPrefix(): string {
-    return Utils.logPrefix(' Bootstrap');
+    return Utils.logPrefix(' Bootstrap |');
   }
 }