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

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index e97c1c6c..f3311672 100644
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -1,8 +1,10 @@
-import { StationWorkerData, 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';
@@ -21,7 +23,7 @@ export default class Bootstrap {
 
   private constructor() {
     this.started = false;
-    this.workerScript = path.join(path.resolve(__dirname, '../'), 'charging-station', 'StationWorker.js');
+    this.workerScript = path.join(path.resolve(__dirname, '../'), 'charging-station', 'ChargingStationWorker.js');
     this.initWorkerImplementation();
     Bootstrap.storage = StorageFactory.getStorage(Configuration.getPerformanceStorage().type, Configuration.getPerformanceStorage().URI, this.logPrefix());
     Configuration.setConfigurationChangeCallback(async () => Bootstrap.getInstance().restart());
@@ -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()) {
@@ -45,7 +48,7 @@ export default class Bootstrap {
             try {
               const nbStations = stationURL.numberOfStations ? stationURL.numberOfStations : 0;
               for (let index = 1; index <= nbStations; index++) {
-                const workerData: StationWorkerData = {
+                const workerData: ChargingStationWorkerData = {
                   index,
                   templateFile: path.join(path.resolve(__dirname, '../'), 'assets', 'station-templates', path.basename(stationURL.file))
                 };
@@ -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,8 +88,8 @@ export default class Bootstrap {
     await this.start();
   }
 
-  private initWorkerImplementation() {
-    Bootstrap.workerImplementation = WorkerFactory.getWorkerImplementation<StationWorkerData>(this.workerScript, Configuration.getWorkerProcess(),
+  private initWorkerImplementation(): void {
+    Bootstrap.workerImplementation = WorkerFactory.getWorkerImplementation<ChargingStationWorkerData>(this.workerScript, Configuration.getWorkerProcess(),
       {
         startDelay: Configuration.getWorkerStartDelay(),
         poolMaxSize: Configuration.getWorkerPoolMaxSize(),
@@ -93,18 +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);
+          }
         }
       });
-    if (!Bootstrap.workerImplementation) {
-      throw new Error('Worker implementation not found');
-    }
   }
 
   private logPrefix(): string {
-    return Utils.logPrefix(' Bootstrap');
+    return Utils.logPrefix(' Bootstrap |');
   }
 }