X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Ffixed.ts;h=9022c7025961e9fc206358a48843c9fc5070b0be;hb=8cc4ea811611b8ad77c7b0379911afe497f2e7e4;hp=eadbfcfe4fa96af126629ab3a851d47c2b38e5d5;hpb=aa9eede876376ffbb6d8585192f3865849252f5c;p=poolifier.git

diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts
index eadbfcfe..9022c702 100644
--- a/src/pools/cluster/fixed.ts
+++ b/src/pools/cluster/fixed.ts
@@ -60,13 +60,21 @@ export class FixedClusterPool<
   }
 
   /** @inheritDoc */
-  protected destroyWorkerNode (workerNodeKey: number): void {
+  protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+    this.flushTasksQueue(workerNodeKey)
+    // FIXME: wait for tasks to be finished
     const worker = this.workerNodes[workerNodeKey].worker
-    this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.id })
+    const waitWorkerExit = new Promise<void>((resolve) => {
+      worker.on('exit', () => {
+        resolve()
+      })
+    })
     worker.on('disconnect', () => {
       worker.kill()
     })
+    await this.sendKillMessageToWorker(workerNodeKey, worker.id)
     worker.disconnect()
+    await waitWorkerExit
   }
 
   /** @inheritDoc */