X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Ffixed.ts;fp=src%2Fpools%2Fcluster%2Ffixed.ts;h=f3fb54bbf4a08bd0ee6d28f623f3ac04f55630f1;hb=c3719753af0a9be03abf722a7543495359e817b5;hp=b74f034bc199d9d4e89f77f0856b00855cf1685a;hpb=0bf5dba7344871d1b481fd29bbe99f1c609b18bf;p=poolifier.git

diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts
index b74f034b..f3fb54bb 100644
--- a/src/pools/cluster/fixed.ts
+++ b/src/pools/cluster/fixed.ts
@@ -1,27 +1,9 @@
-import cluster, { type ClusterSettings, type Worker } from 'node:cluster'
+import cluster, { type Worker } from 'node:cluster'
 import type { MessageValue } from '../../utility-types'
 import { AbstractPool } from '../abstract-pool'
 import { type PoolOptions, type PoolType, PoolTypes } from '../pool'
 import { type WorkerType, WorkerTypes } from '../worker'
 
-/**
- * Options for a poolifier cluster pool.
- */
-export interface ClusterPoolOptions extends PoolOptions<Worker> {
-  /**
-   * Key/value pairs to add to worker process environment.
-   *
-   * @see https://nodejs.org/api/cluster.html#cluster_cluster_fork_env
-   */
-  env?: Record<string, unknown>
-  /**
-   * Cluster settings.
-   *
-   * @see https://nodejs.org/api/cluster.html#cluster_cluster_settings
-   */
-  settings?: ClusterSettings
-}
-
 /**
  * A cluster pool with a fixed number of workers.
  *
@@ -44,7 +26,7 @@ export class FixedClusterPool<
   public constructor (
     numberOfWorkers: number,
     filePath: string,
-    protected readonly opts: ClusterPoolOptions = {}
+    protected readonly opts: PoolOptions<Worker> = {}
   ) {
     super(numberOfWorkers, filePath, opts)
   }
@@ -65,18 +47,17 @@ export class FixedClusterPool<
     this.flushTasksQueue(workerNodeKey)
     // FIXME: wait for tasks to be finished
     const workerNode = this.workerNodes[workerNodeKey]
-    const worker = workerNode.worker
     const waitWorkerExit = new Promise<void>(resolve => {
-      worker.once('exit', () => {
+      workerNode.registerOnceWorkerEventHandler('exit', () => {
         resolve()
       })
     })
-    worker.once('disconnect', () => {
-      worker.kill()
+    workerNode.registerOnceWorkerEventHandler('disconnect', () => {
+      workerNode.worker.kill()
     })
     await this.sendKillMessageToWorker(workerNodeKey)
     workerNode.removeAllListeners()
-    worker.disconnect()
+    workerNode.worker.disconnect()
     await waitWorkerExit
   }
 
@@ -122,11 +103,6 @@ export class FixedClusterPool<
     this.workerNodes[workerNodeKey].worker.off('message', listener)
   }
 
-  /** @inheritDoc */
-  protected createWorker (): Worker {
-    return cluster.fork(this.opts.env)
-  }
-
   /** @inheritDoc */
   protected get type (): PoolType {
     return PoolTypes.fixed