X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FBootstrap.ts;h=bb101ca7b75bf3f79153770a0d0dce82ef51d494;hb=aa8cbc5c65e51e1d7c955186847b7105a292d42f;hp=297c0870a14a2e9a44cd7dbb5c49139e241dafcb;hpb=fd1fdf1b7bd53ee19679eb9c7d83b2592c32aed7;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts index 297c0870..bb101ca7 100644 --- a/src/charging-station/Bootstrap.ts +++ b/src/charging-station/Bootstrap.ts @@ -15,6 +15,7 @@ export default class Bootstrap { private constructor() { this.started = false; this.workerScript = path.join(path.resolve(__dirname, '../'), 'charging-station', 'StationWorker.js'); + Configuration.setConfigurationChangeCallback(async () => this.restart()); } public static getInstance(): Bootstrap { @@ -43,7 +44,6 @@ export default class Bootstrap { numStationsTotal++; } } catch (error) { - // eslint-disable-next-line no-console console.error('Charging station start with template file ' + stationURL.file + ' error ', error); } } @@ -53,11 +53,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} charging station(s) per worker)`); + 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)` : ''}`); } this.started = true; } catch (error) { - // eslint-disable-next-line no-console console.error('Bootstrap start error ', error); } } @@ -65,11 +64,9 @@ export default class Bootstrap { public async stop(): Promise { if (isMainThread && this.started) { - if (this.getWorkerImplementationInstance()) { - await this.getWorkerImplementationInstance().stop(); - // Nullify to force worker implementation instance creation - this.workerImplementationInstance = null; - } + await this.getWorkerImplementationInstance().stop(); + // Nullify to force worker implementation instance creation + this.workerImplementationInstance = null; } this.started = false; } @@ -81,11 +78,13 @@ export default class Bootstrap { private getWorkerImplementationInstance(): WorkerAbstract { if (!this.workerImplementationInstance) { - this.workerImplementationInstance = WorkerFactory.getWorkerImplementation(this.workerScript, Configuration.getWorkerProcess(), { - poolMaxSize: Configuration.getWorkerPoolMaxSize(), - poolMinSize: Configuration.getWorkerPoolMinSize(), - elementsPerWorker: Configuration.getChargingStationsPerWorker() - }); + this.workerImplementationInstance = WorkerFactory.getWorkerImplementation(this.workerScript, Configuration.getWorkerProcess(), + { + startDelay: Configuration.getWorkerStartDelay(), + poolMaxSize: Configuration.getWorkerPoolMaxSize(), + poolMinSize: Configuration.getWorkerPoolMinSize(), + elementsPerWorker: Configuration.getChargingStationsPerWorker() + }); } return this.workerImplementationInstance; }