X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2FWorkerStaticPool.ts;h=23112a6c566ff0b95f6f07cf48b606332ab1b7fd;hb=45df3874f855f883ba8b56238973966b455555eb;hp=818fd21af48f1c466b9e8dc8920ed94bb73a915a;hpb=5767874516784070db4445321b5212ad7e5a84b4;p=e-mobility-charging-stations-simulator.git diff --git a/src/worker/WorkerStaticPool.ts b/src/worker/WorkerStaticPool.ts index 818fd21a..23112a6c 100644 --- a/src/worker/WorkerStaticPool.ts +++ b/src/worker/WorkerStaticPool.ts @@ -1,6 +1,6 @@ -import { WorkerData, WorkerOptions } from '../types/Worker'; - import { FixedThreadPool } from 'poolifier'; + +import type { WorkerData, WorkerOptions } from '../types/Worker'; import Utils from '../utils/Utils'; import WorkerAbstract from './WorkerAbstract'; import { WorkerUtils } from './WorkerUtils'; @@ -16,8 +16,15 @@ export default class WorkerStaticPool extends WorkerAbstract { */ constructor(workerScript: string, workerOptions?: WorkerOptions) { super(workerScript, workerOptions); - this.workerOptions.poolOptions.exitHandler = this.workerOptions?.poolOptions?.exitHandler ?? WorkerUtils.defaultExitHandler; - this.pool = new FixedThreadPool(this.workerOptions.poolMaxSize, this.workerScript, this.workerOptions.poolOptions); + this.workerOptions.poolOptions.errorHandler = + this.workerOptions?.poolOptions?.errorHandler ?? WorkerUtils.defaultErrorHandler; + this.workerOptions.poolOptions.exitHandler = + this.workerOptions?.poolOptions?.exitHandler ?? WorkerUtils.defaultExitHandler; + this.pool = new FixedThreadPool( + this.workerOptions.poolMaxSize, + this.workerScript, + this.workerOptions.poolOptions + ); } get size(): number { @@ -55,6 +62,7 @@ export default class WorkerStaticPool extends WorkerAbstract { public async addElement(elementData: WorkerData): Promise { await this.pool.execute(elementData); // Start element sequentially to optimize memory at startup - this.workerOptions.elementStartDelay > 0 && await Utils.sleep(this.workerOptions.elementStartDelay); + this.workerOptions.elementStartDelay > 0 && + (await Utils.sleep(this.workerOptions.elementStartDelay)); } }