X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fstart.ts;h=90eb5161fc4c85b3c3a6330e6398b7d82102a2ef;hb=3e1416d80bd2640a5fe59cb4bc95c421dcd601d6;hp=e841b57ec63692d173ea6f8e9d69703be546e668;hpb=ad3de6c4ec07b788fe1c84a40081902c3abc5b3b;p=e-mobility-charging-stations-simulator.git

diff --git a/src/start.ts b/src/start.ts
index e841b57e..90eb5161 100644
--- a/src/start.ts
+++ b/src/start.ts
@@ -1,42 +1,43 @@
 import Configuration from './utils/Configuration';
-import { StationTemplateURL } from './types/ConfigurationData';
-import Wrk from './charging-station/Worker';
+import WorkerData from './types/WorkerData';
+import WorkerFactory from './worker/WorkerFactory';
+import Wrk from './worker/Wrk';
 
 class Bootstrap {
   static start() {
     try {
       let numStationsTotal = 0;
-      let numConcurrentWorkers = 0;
-      // Start each ChargingStation object in a worker thread
+      const workerImplementation: Wrk = WorkerFactory.getWorkerImpl('./dist/charging-station/StationWorker.js');
+      void workerImplementation.start();
+      // Start ChargingStation object in worker thread
       if (Configuration.getStationTemplateURLs()) {
-        Configuration.getStationTemplateURLs().forEach((stationURL: StationTemplateURL) => {
+        for (const stationURL of Configuration.getStationTemplateURLs()) {
           try {
             const nbStations = stationURL.numberOfStations ? stationURL.numberOfStations : 0;
-            numStationsTotal += nbStations;
             for (let index = 1; index <= nbStations; index++) {
-              const worker = new Wrk('./dist/charging-station/StationWorker.js', {
+              const workerData: WorkerData = {
                 index,
-                templateFile: stationURL.file,
-              }, numStationsTotal);
-              worker.start().catch(() => {});
-              numConcurrentWorkers = worker.concurrentWorkers;
+                templateFile: stationURL.file
+              };
+              void 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 {
         console.log('No stationTemplateURLs defined in configuration, exiting');
       }
       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) of ' + numConcurrentWorkers.toString() + ' concurrently running');
+        console.log(`Charging station simulator started with ${numStationsTotal.toString()} charging station(s) and ${workerImplementation.size}${Configuration.useWorkerPool() ? `/${Configuration.getWorkerPoolMaxSize().toString()}` : ''} worker(s) concurrently running (${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);
     }
   }
 }