X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerSet.ts;h=fd81840a7a35139e238ff203facef400576e6572;hb=ec4a242aa5f1a9d4201d0ec9988f9dd931978589;hp=bc1a4c0871547b5485d7ab8c443733741e90d8c3;hpb=c26984f2a8831eeb78ce791837f0032fd4bc8824;p=e-mobility-charging-stations-simulator.git diff --git a/src/worker/WorkerSet.ts b/src/worker/WorkerSet.ts index bc1a4c08..fd81840a 100644 --- a/src/worker/WorkerSet.ts +++ b/src/worker/WorkerSet.ts @@ -77,15 +77,15 @@ export class WorkerSet extends WorkerAbstract { /** @inheritDoc */ public async stop(): Promise { for (const workerSetElement of this.workerSet) { - const workerExitPromise = new Promise((resolve) => { - workerSetElement.worker.on('exit', () => { + const worker = workerSetElement.worker; + const waitWorkerExit = new Promise((resolve) => { + worker.on('exit', () => { resolve(); }); }); - await workerSetElement.worker.terminate(); - await workerExitPromise; + await worker.terminate(); + await waitWorkerExit; } - this.workerSet.clear(); } /** @inheritDoc */ @@ -119,7 +119,7 @@ export class WorkerSet extends WorkerAbstract { ); worker.on('message', (message: WorkerMessage) => { if (message.event === WorkerMessageEvents.startedWorkerElement) { - this.emitter?.emit(WorkerSetEvents.elementStarted, message.data); + this.emitter?.emit(WorkerSetEvents.elementStarted, this.info); } else if (message.event === WorkerMessageEvents.startWorkerElementError) { this.emitter?.emit(WorkerSetEvents.elementError, message.data); }