Fix workerSet process mode.

[e-mobility-charging-stations-simulator.git] / src / start.ts

diff --git a/src/start.ts b/src/start.ts
index 94af1c54fb8999ef42e6c5f3e5b1b5e020bd772f..04dd28140811d09d114ce59aa1c87a00a7d467d7 100644 (file)
--- a/src/start.ts
+++ b/src/start.ts
@@ -1,53 +1,35 @@
 import Configuration from './utils/Configuration';
-import Constants from './utils/Constants';
+import { StationWorkerData } from './types/Worker';
 import Utils from './utils/Utils';
-import WorkerData from './types/WorkerData';
-import Wrk from './charging-station/Worker';
+import WorkerFactory from './worker/WorkerFactory';
+import Wrk from './worker/Wrk';
 
 class Bootstrap {
   static async start() {
     try {
       let numStationsTotal = 0;
-      let numConcurrentWorkers = 0;
-      const chargingStationsPerWorker = Configuration.getChargingStationsPerWorker();
-      let chargingStationsPerWorkerCounter = 0;
-      let worker: Wrk;
-      // Start each ChargingStation object in a worker thread
+      const workerImplementation: Wrk = WorkerFactory.getWorkerImpl('./dist/charging-station/StationWorker.js', Configuration.getWorkerProcess(), {
+        poolMaxSize: Configuration.getWorkerPoolMaxSize(),
+        poolMinSize: Configuration.getWorkerPoolMinSize(),
+        elementsPerWorker: Configuration.getChargingStationsPerWorker()
+      });
+      await workerImplementation.start();
+      // Start ChargingStation object in worker thread
       if (Configuration.getStationTemplateURLs()) {
         for (const stationURL of Configuration.getStationTemplateURLs()) {
           try {
             const nbStations = stationURL.numberOfStations ? stationURL.numberOfStations : 0;
             for (let index = 1; index <= nbStations; index++) {
-              const workerData = {
+              const workerData: StationWorkerData = {
                 index,
                 templateFile: stationURL.file
-              } as WorkerData;
-              if (Configuration.useWorkerPool()) {
-                worker = new Wrk('./dist/charging-station/StationWorker.js', workerData);
-                worker.start().catch(() => { });
-                numConcurrentWorkers = worker.getWorkerPoolSize();
-                numStationsTotal = numConcurrentWorkers;
-                // Start Wrk sequentially to optimize memory at start time
-                await Utils.sleep(Constants.START_WORKER_DELAY);
-              } else if (!Configuration.useWorkerPool() && (chargingStationsPerWorkerCounter === 0 || chargingStationsPerWorkerCounter === chargingStationsPerWorker)) {
-                // Start new Wrk with one charging station
-                worker = new Wrk('./dist/charging-station/StationWorker.js', workerData);
-                worker.start().catch(() => { });
-                numConcurrentWorkers++;
-                numStationsTotal++;
-                chargingStationsPerWorkerCounter = 1;
-                // Start Wrk sequentially to optimize memory at start time
-                await Utils.sleep(Constants.START_WORKER_DELAY);
-              } else if (!Configuration.useWorkerPool()) {
-                // Add charging station to existing Wrk
-                worker.addWorkerElement(workerData);
-                chargingStationsPerWorkerCounter++;
-                numStationsTotal++;
-              }
+              };
+              await workerImplementation.addElement(workerData);
+              numStationsTotal++;
             }
           } catch (error) {
             // eslint-disable-next-line no-console
-            console.log('Charging station start with template file ' + stationURL.file + ' error ' + JSON.stringify(error, null, ' '));
+            console.error('Charging station start with template file ' + stationURL.file + ' error ', error);
           }
         }
       } else {
@@ -55,14 +37,12 @@ class Bootstrap {
       }
       if (numStationsTotal === 0) {
         console.log('No charging station template enabled in configuration, exiting');
-      } else if (Configuration.useWorkerPool()) {
-        console.log('Charging station simulator started with ' + numStationsTotal.toString() + ' charging station(s) and ' + numConcurrentWorkers.toString() + '/' + Configuration.getWorkerPoolMaxSize().toString() + ' worker(s) concurrently running');
       } else {
-        console.log('Charging station simulator started with ' + numStationsTotal.toString() + ' charging station(s) and ' + numConcurrentWorkers.toString() + ' worker(s) concurrently running');
+        console.log(`Charging station simulator started with ${numStationsTotal.toString()} charging station(s) and ${Utils.workerDynamicPoolInUse() ? `${Configuration.getWorkerPoolMinSize().toString()}/` : ''}${workerImplementation.size}${Utils.workerPoolInUse() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''} worker(s) concurrently running in '${Configuration.getWorkerProcess()}' mode (${workerImplementation.maxElementsPerWorker} charging station(s) per worker)`);
       }
     } catch (error) {
       // eslint-disable-next-line no-console
-      console.log('Bootstrap start error ' + JSON.stringify(error, null, ' '));
+      console.error('Bootstrap start error ', error);
     }
   }
 }