X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fcluster%2Fdynamic.ts;h=b0bb697372cdc3312d4cf78200ecc7ceca214cac;hb=b8818d59f9e410ce2e3b0103b8372b3fa1badf8f;hp=3d523890463c1d82a05d200dd16a269557107220;hpb=50eceb07c3713782d1d6bbe49d3fe47318e45c93;p=poolifier.git

diff --git a/src/pools/cluster/dynamic.ts b/src/pools/cluster/dynamic.ts
index 3d523890..b0bb6973 100644
--- a/src/pools/cluster/dynamic.ts
+++ b/src/pools/cluster/dynamic.ts
@@ -1,5 +1,5 @@
 import type { Worker } from 'cluster'
-import type { JSONValue, MessageValue } from '../../utility-types'
+import type { JSONValue } from '../../utility-types'
 import type { ClusterPoolOptions } from './fixed'
 import { FixedClusterPool } from './fixed'
 
@@ -46,32 +46,26 @@ export class DynamicClusterPool<
    * @returns Cluster worker.
    */
   protected chooseWorker (): Worker {
-    let worker: Worker | undefined
-    for (const entry of this.tasks) {
-      if (entry[1] === 0) {
-        worker = entry[0]
-        break
+    for (const [worker, numberOfTasks] of this.tasks) {
+      if (numberOfTasks === 0) {
+        // A worker is free, use it
+        return worker
       }
     }
 
-    if (worker) {
-      // A worker is free, use it
-      return worker
-    } else {
-      if (this.workers.length === this.max) {
-        this.emitter.emit('FullPool')
-        return super.chooseWorker()
-      }
-      // All workers are busy, create a new worker
-      const worker = this.internalNewWorker()
-      worker.on('message', (message: MessageValue<Data>) => {
-        if (message.kill) {
-          this.sendToWorker(worker, { kill: 1 })
-          void this.destroyWorker(worker)
-          this.removeWorker(worker)
-        }
-      })
-      return worker
+    if (this.workers.length === this.max) {
+      this.emitter.emit('FullPool')
+      return super.chooseWorker()
     }
+
+    // All workers are busy, create a new worker
+    const worker = this.createAndSetupWorker()
+    this.registerWorkerMessageListener<Data>(worker, message => {
+      if (message.kill) {
+        this.sendToWorker(worker, { kill: 1 })
+        void this.destroyWorker(worker)
+      }
+    })
+    return worker
   }
 }