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

diff --git a/src/start.ts b/src/start.ts
index f316d0ad..90eb5161 100644
--- a/src/start.ts
+++ b/src/start.ts
@@ -1,23 +1,15 @@
 import Configuration from './utils/Configuration';
-import Constants from './utils/Constants';
-import Utils from './utils/Utils';
 import WorkerData from './types/WorkerData';
-import WorkerGroup from './charging-station/WorkerGroup';
-import WorkerPool from './charging-station/WorkerPool';
+import WorkerFactory from './worker/WorkerFactory';
+import Wrk from './worker/Wrk';
 
 class Bootstrap {
-  static async start() {
+  static start() {
     try {
       let numStationsTotal = 0;
-      let numConcurrentWorkers = 0;
-      const chargingStationsPerWorker = Configuration.getChargingStationsPerWorker();
-      let chargingStationsPerWorkerCounter = 0;
-      let workerImplementation: WorkerGroup | WorkerPool;
-      if (Configuration.useWorkerPool()) {
-        workerImplementation = new WorkerPool('./dist/charging-station/StationWorker.js');
-        void workerImplementation.start();
-      }
-      // 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()) {
         for (const stationURL of Configuration.getStationTemplateURLs()) {
           try {
@@ -27,32 +19,12 @@ class Bootstrap {
                 index,
                 templateFile: stationURL.file
               };
-              if (Configuration.useWorkerPool()) {
-                void workerImplementation.addElement(workerData);
-                numConcurrentWorkers = workerImplementation.size;
-                // Start worker sequentially to optimize memory at start time
-                await Utils.sleep(Constants.START_WORKER_DELAY);
-              } else {
-                // eslint-disable-next-line no-lonely-if
-                if (chargingStationsPerWorkerCounter === 0 || chargingStationsPerWorkerCounter >= chargingStationsPerWorker) {
-                  // Start new WorkerGroup with one charging station
-                  workerImplementation = new WorkerGroup('./dist/charging-station/StationWorker.js', workerData, chargingStationsPerWorker);
-                  void workerImplementation.start();
-                  numConcurrentWorkers++;
-                  chargingStationsPerWorkerCounter = 1;
-                  // Start worker sequentially to optimize memory at start time
-                  await Utils.sleep(Constants.START_WORKER_DELAY);
-                } else {
-                  // Add charging station to existing WorkerGroup
-                  void workerImplementation.addElement(workerData);
-                  chargingStationsPerWorkerCounter++;
-                }
-              }
+              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 {
@@ -60,20 +32,14 @@ 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 ${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);
     }
   }
 }
 
-Bootstrap.start().catch(
-  (error) => {
-    console.error(error);
-  }
-);
+Bootstrap.start();