X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Ffixed.ts;h=17ef7e9e57adcb91967b30be12cef158d1fc37fd;hb=dbd73092cca6cabb2b41e18b944656fc43f8757b;hp=b5b32527cf595b8b4ec8f52f3290a10e4647cbd4;hpb=8ad621cc1d32ed396fca3ef2ec48337e42d2dcc2;p=poolifier.git diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts index b5b32527..17ef7e9e 100644 --- a/src/pools/cluster/fixed.ts +++ b/src/pools/cluster/fixed.ts @@ -63,8 +63,9 @@ export class FixedClusterPool< protected async destroyWorkerNode (workerNodeKey: number): Promise { this.flushTasksQueue(workerNodeKey) // FIXME: wait for tasks to be finished - const worker = this.workerNodes[workerNodeKey].worker - const waitWorkerExit = new Promise((resolve) => { + const workerNode = this.workerNodes[workerNodeKey] + const worker = workerNode.worker + const waitWorkerExit = new Promise(resolve => { worker.on('exit', () => { resolve() }) @@ -72,7 +73,10 @@ export class FixedClusterPool< worker.on('disconnect', () => { worker.kill() }) - this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.id }) + await this.sendKillMessageToWorker( + workerNodeKey, + workerNode.info.id as number + ) worker.disconnect() await waitWorkerExit } @@ -89,7 +93,7 @@ export class FixedClusterPool< protected sendStartupMessageToWorker (workerNodeKey: number): void { this.sendToWorker(workerNodeKey, { ready: false, - workerId: this.workerNodes[workerNodeKey].worker.id + workerId: this.workerNodes[workerNodeKey].info.id as number }) } @@ -116,16 +120,6 @@ export class FixedClusterPool< return WorkerTypes.cluster } - /** @inheritDoc */ - protected get minSize (): number { - return this.numberOfWorkers - } - - /** @inheritDoc */ - protected get maxSize (): number { - return this.numberOfWorkers - } - /** @inheritDoc */ protected get busy (): boolean { return this.internalBusy()