X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcharging-station%2FBootstrap.ts;h=7fd000a20a5746d968f0538a536f617009946a16;hb=81797102d5214fea2fc58eff2666fe8b8d9a5a11;hp=6770f7bba47079a803bfc5d64377109c3f6e405c;hpb=85f78bc091168613cf4a82d3655313796d540d06;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index 6770f7bb..7fd000a2 100644
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -1,20 +1,29 @@
+import { StationWorkerData, WorkerEvents, WorkerMessage } from '../types/Worker';
+
 import Configuration from '../utils/Configuration';
-import { StationWorkerData } from '../types/Worker';
+import { Storage } from '../utils/performance-storage/Storage';
+import { StorageFactory } from '../utils/performance-storage/StorageFactory';
 import Utils from '../utils/Utils';
 import WorkerAbstract from '../worker/WorkerAbstract';
 import WorkerFactory from '../worker/WorkerFactory';
 import { isMainThread } from 'worker_threads';
 import path from 'path';
+import { version } from '../../package.json';
 
 export default class Bootstrap {
-  private static instance: Bootstrap;
+  private static instance: Bootstrap | null = null;
+  private static workerImplementation: WorkerAbstract | null = null;
+  private static storage: Storage;
+  private version: string = version;
   private started: boolean;
   private workerScript: string;
-  private workerImplementationInstance: WorkerAbstract;
 
   private constructor() {
     this.started = false;
     this.workerScript = path.join(path.resolve(__dirname, '../'), 'charging-station', 'StationWorker.js');
+    this.initWorkerImplementation();
+    Bootstrap.storage = StorageFactory.getStorage(Configuration.getPerformanceStorage().type, Configuration.getPerformanceStorage().URI, this.logPrefix());
+    Configuration.setConfigurationChangeCallback(async () => Bootstrap.getInstance().restart());
   }
 
   public static getInstance(): Bootstrap {
@@ -28,7 +37,7 @@ export default class Bootstrap {
     if (isMainThread && !this.started) {
       try {
         let numStationsTotal = 0;
-        await this.getWorkerImplementationInstance().start();
+        await Bootstrap.workerImplementation.start();
         // Start ChargingStation object in worker thread
         if (Configuration.getStationTemplateURLs()) {
           for (const stationURL of Configuration.getStationTemplateURLs()) {
@@ -39,11 +48,10 @@ export default class Bootstrap {
                   index,
                   templateFile: path.join(path.resolve(__dirname, '../'), 'assets', 'station-templates', path.basename(stationURL.file))
                 };
-                await this.getWorkerImplementationInstance().addElement(workerData);
+                await Bootstrap.workerImplementation.addElement(workerData);
                 numStationsTotal++;
               }
             } catch (error) {
-            // eslint-disable-next-line no-console
               console.error('Charging station start with template file ' + stationURL.file + ' error ', error);
             }
           }
@@ -53,11 +61,10 @@ export default class Bootstrap {
         if (numStationsTotal === 0) {
           console.log('No charging station template enabled in configuration, exiting');
         } else {
-          console.log(`Charging station simulator started with ${numStationsTotal.toString()} charging station(s) and ${Utils.workerDynamicPoolInUse() ? `${Configuration.getWorkerPoolMinSize().toString()}/` : ''}${this.getWorkerImplementationInstance().size}${Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''} worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode${this.getWorkerImplementationInstance().maxElementsPerWorker ? ` (${this.getWorkerImplementationInstance().maxElementsPerWorker} charging station(s) per worker)` : ''}`);
+          console.log(`Charging station simulator ${this.version} started with ${numStationsTotal.toString()} charging station(s) and ${Utils.workerDynamicPoolInUse() ? `${Configuration.getWorkerPoolMinSize().toString()}/` : ''}${Bootstrap.workerImplementation.size}${Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''} worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode${Bootstrap.workerImplementation.maxElementsPerWorker ? ` (${Bootstrap.workerImplementation.maxElementsPerWorker} charging station(s) per worker)` : ''}`);
         }
         this.started = true;
       } catch (error) {
-      // eslint-disable-next-line no-console
         console.error('Bootstrap start error ', error);
       }
     }
@@ -65,28 +72,38 @@ export default class Bootstrap {
 
   public async stop(): Promise<void> {
     if (isMainThread && this.started) {
-      if (this.getWorkerImplementationInstance()) {
-        await this.getWorkerImplementationInstance().stop();
-        // Nullify to force worker implementation instance creation
-        this.workerImplementationInstance = null;
-      }
+      await Bootstrap.workerImplementation.stop();
     }
     this.started = false;
   }
 
   public async restart(): Promise<void> {
     await this.stop();
+    this.initWorkerImplementation();
     await this.start();
   }
 
-  private getWorkerImplementationInstance(): WorkerAbstract {
-    if (!this.workerImplementationInstance) {
-      this.workerImplementationInstance = WorkerFactory.getWorkerImplementation<StationWorkerData>(this.workerScript, Configuration.getWorkerProcess(), {
+  private initWorkerImplementation() {
+    Bootstrap.workerImplementation = WorkerFactory.getWorkerImplementation<StationWorkerData>(this.workerScript, Configuration.getWorkerProcess(),
+      {
+        startDelay: Configuration.getWorkerStartDelay(),
         poolMaxSize: Configuration.getWorkerPoolMaxSize(),
         poolMinSize: Configuration.getWorkerPoolMinSize(),
-        elementsPerWorker: Configuration.getChargingStationsPerWorker()
+        elementsPerWorker: Configuration.getChargingStationsPerWorker(),
+        poolOptions: {
+          workerChoiceStrategy: Configuration.getWorkerPoolStrategy()
+        }
+      }, (msg: WorkerMessage) => {
+        if (msg.id === WorkerEvents.PERFORMANCE_STATISTICS) {
+          Bootstrap.storage.storePerformanceStatistics(msg.data);
+        }
       });
+    if (!Bootstrap.workerImplementation) {
+      throw new Error('Worker implementation not found');
     }
-    return this.workerImplementationInstance;
+  }
+
+  private logPrefix(): string {
+    return Utils.logPrefix(' Bootstrap');
   }
 }