X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Fdynamic.ts;h=d71abd01a6c52dfd8b7045f45c01f183b0b93715;hb=17a9a09416d6c07f560eb0c79bd031d8c0125d4e;hp=eb93c0c8c6d5ac00908e4311f13b1b4392bc4d64;hpb=e8ea58d292e381a6be7f4d0fee5d5b691adb37ac;p=poolifier.git

diff --git a/src/pools/cluster/dynamic.ts b/src/pools/cluster/dynamic.ts
index eb93c0c8..d71abd01 100644
--- a/src/pools/cluster/dynamic.ts
+++ b/src/pools/cluster/dynamic.ts
@@ -1,8 +1,8 @@
 import type { Worker } from 'cluster'
 import type { JSONValue } from '../../utility-types'
+import { isKillBehavior, KillBehaviors } from '../../worker/worker-options'
 import type { ClusterPoolOptions } from './fixed'
 import { FixedClusterPool } from './fixed'
-import { killBehaviorTypes } from '../../worker/worker-options'
 
 /**
  * A cluster pool with a dynamic number of workers, but a guaranteed minimum number of workers.
@@ -25,16 +25,16 @@ export class DynamicClusterPool<
    *
    * @param min Minimum number of workers which are always active.
    * @param max Maximum number of workers that can be created by this pool.
-   * @param filename Path to an implementation of a `ClusterWorker` file, which can be relative or absolute.
-   * @param opts Options for this fixed cluster pool. Default: `{ maxTasks: 1000 }`
+   * @param filePath Path to an implementation of a `ClusterWorker` file, which can be relative or absolute.
+   * @param opts Options for this dynamic cluster pool. Default: `{ maxTasks: 1000 }`
    */
   public constructor (
     min: number,
     public readonly max: number,
-    filename: string,
+    filePath: string,
     opts: ClusterPoolOptions = { maxTasks: 1000 }
   ) {
-    super(min, filename, opts)
+    super(min, filePath, opts)
   }
 
   /**
@@ -60,17 +60,17 @@ export class DynamicClusterPool<
     }
 
     // All workers are busy, create a new worker
-    const worker = this.createAndSetupWorker()
-    this.registerWorkerMessageListener<Data>(worker, message => {
-      const tasksInProgress = this.tasks.get(worker)
-      const isKillBehaviorOptionHard =
-        message.kill === killBehaviorTypes.HARD
-      if (isKillBehaviorOptionHard || tasksInProgress === 0) {
+    const workerCreated = this.createAndSetupWorker()
+    this.registerWorkerMessageListener<Data>(workerCreated, message => {
+      const tasksInProgress = this.tasks.get(workerCreated)
+      if (
+        isKillBehavior(KillBehaviors.HARD, message.kill) ||
+        tasksInProgress === 0
+      ) {
         // Kill received from the worker, means that no new tasks are submitted to that worker for a while ( > maxInactiveTime)
-        this.sendToWorker(worker, { kill: 1 })
-        void this.destroyWorker(worker)
+        void this.destroyWorker(workerCreated)
       }
     })
-    return worker
+    return workerCreated
   }
 }