X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Ffixed.ts;h=b74f034bc199d9d4e89f77f0856b00855cf1685a;hb=fa548cda5120ac0708d82f37cd0ce1260d7f96c1;hp=c7c95c4b3dad537b39dfd44d37481178035fcb4c;hpb=16f3605c35d8a2ef293a4382c6e846dc27915b4a;p=poolifier.git

diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts
index c7c95c4b..b74f034b 100644
--- a/src/pools/cluster/fixed.ts
+++ b/src/pools/cluster/fixed.ts
@@ -61,18 +61,21 @@ export class FixedClusterPool<
 
   /** @inheritDoc */
   protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+    this.flagWorkerNodeAsNotReady(workerNodeKey)
     this.flushTasksQueue(workerNodeKey)
     // FIXME: wait for tasks to be finished
-    const worker = this.workerNodes[workerNodeKey].worker
-    const waitWorkerExit = new Promise<void>((resolve) => {
-      worker.on('exit', () => {
+    const workerNode = this.workerNodes[workerNodeKey]
+    const worker = workerNode.worker
+    const waitWorkerExit = new Promise<void>(resolve => {
+      worker.once('exit', () => {
         resolve()
       })
     })
-    worker.on('disconnect', () => {
+    worker.once('disconnect', () => {
       worker.kill()
     })
-    await this.sendKillMessageToWorker(workerNodeKey, worker.id)
+    await this.sendKillMessageToWorker(workerNodeKey)
+    workerNode.removeAllListeners()
     worker.disconnect()
     await waitWorkerExit
   }
@@ -82,14 +85,16 @@ export class FixedClusterPool<
     workerNodeKey: number,
     message: MessageValue<Data>
   ): void {
-    this.workerNodes[workerNodeKey].worker.send(message)
+    this.workerNodes[workerNodeKey].worker.send({
+      ...message,
+      workerId: this.getWorkerInfo(workerNodeKey).id as number
+    })
   }
 
   /** @inheritDoc */
   protected sendStartupMessageToWorker (workerNodeKey: number): void {
     this.sendToWorker(workerNodeKey, {
-      ready: false,
-      workerId: this.workerNodes[workerNodeKey].worker.id
+      ready: false
     })
   }
 
@@ -101,6 +106,22 @@ export class FixedClusterPool<
     this.workerNodes[workerNodeKey].worker.on('message', listener)
   }
 
+  /** @inheritDoc */
+  protected registerOnceWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    this.workerNodes[workerNodeKey].worker.once('message', listener)
+  }
+
+  /** @inheritDoc */
+  protected deregisterWorkerMessageListener<Message extends Data | Response>(
+    workerNodeKey: number,
+    listener: (message: MessageValue<Message>) => void
+  ): void {
+    this.workerNodes[workerNodeKey].worker.off('message', listener)
+  }
+
   /** @inheritDoc */
   protected createWorker (): Worker {
     return cluster.fork(this.opts.env)