X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FConfiguration.ts;h=d71af225afec4539344c45da6a3af47604a51219;hb=3ba49ba9f96d06c09f19009dcbe9360eb172782a;hp=ca98427eb87cee39c22c6a720e5998599e2fbabb;hpb=b3f9c51558e73be4ce7915d6dbcb40f1378ba89e;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts
index ca98427e..d71af225 100644
--- a/src/utils/Configuration.ts
+++ b/src/utils/Configuration.ts
@@ -1,8 +1,12 @@
 import ConfigurationData, { StationTemplateURL } from '../types/ConfigurationData';
 
+import Bootstrap from '../charging-station/Bootstrap';
+import { WorkerProcessType } from '../types/Worker';
 import fs from 'fs';
 
 export default class Configuration {
+  private static configurationFilePath = './src/assets/config.json';
+  private static configurationFileWatcher: fs.FSWatcher;
   private static configuration: ConfigurationData;
 
   static getStatisticsDisplayInterval(): number {
@@ -37,12 +41,22 @@ export default class Configuration {
     return Configuration.getConfig().stationTemplateURLs;
   }
 
-  static useWorkerPool(): boolean {
-    return Configuration.getConfig().useWorkerPool;
+  static getWorkerProcess(): WorkerProcessType {
+    Configuration.deprecateConfigurationKey('useWorkerPool;', 'Use \'workerProcess\' to define the type of worker process to use instead');
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'workerProcess') ? Configuration.getConfig().workerProcess : WorkerProcessType.WORKER_SET;
   }
 
-  static getWorkerPoolSize(): number {
-    return Configuration.getConfig().workerPoolSize;
+  static getWorkerPoolMinSize(): number {
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'workerPoolMinSize') ? Configuration.getConfig().workerPoolMinSize : 4;
+  }
+
+  static getWorkerPoolMaxSize(): number {
+    Configuration.deprecateConfigurationKey('workerPoolSize;', 'Use \'workerPoolMaxSize\' instead');
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'workerPoolMaxSize') ? Configuration.getConfig().workerPoolMaxSize : 16;
+  }
+
+  static getChargingStationsPerWorker(): number {
+    return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'chargingStationsPerWorker') ? Configuration.getConfig().chargingStationsPerWorker : 1;
   }
 
   static getLogConsole(): boolean {
@@ -94,11 +108,22 @@ export default class Configuration {
   // Read the config file
   private static getConfig(): ConfigurationData {
     if (!Configuration.configuration) {
-      Configuration.configuration = JSON.parse(fs.readFileSync('./src/assets/config.json', 'utf8')) as ConfigurationData;
+      Configuration.configuration = JSON.parse(fs.readFileSync(Configuration.configurationFilePath, 'utf8')) as ConfigurationData;
+      if (!Configuration.configurationFileWatcher) {
+        Configuration.configurationFileWatcher = Configuration.getConfigurationFileWatcher();
+      }
     }
     return Configuration.configuration;
   }
 
+  private static getConfigurationFileWatcher(): fs.FSWatcher {
+    return fs.watch(Configuration.configurationFilePath).on('change', async (e) => {
+      // Nullify to force configuration file reading
+      Configuration.configuration = null;
+      await Bootstrap.getInstance().restart();
+    });
+  }
+
   private static objectHasOwnProperty(object: any, property: string): boolean {
     return Object.prototype.hasOwnProperty.call(object, property) as boolean;
   }