X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Ffixed.ts;h=3f56c858b0ed5b363fc19da06eb1b9a295a66dd5;hb=2c039e4373e86714cdf27e77440b12ee8eb2e4db;hp=bd5e284496fa82826b51980fdb199c4d4dcbf884;hpb=184855e69fea29f1018024a34be10de2c8e3141a;p=poolifier.git diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts index bd5e2844..3f56c858 100644 --- a/src/pools/cluster/fixed.ts +++ b/src/pools/cluster/fixed.ts @@ -1,5 +1,4 @@ -import type { ClusterSettings, Worker } from 'node:cluster' -import cluster from 'node:cluster' +import cluster, { type ClusterSettings, type Worker } from 'node:cluster' import type { MessageValue } from '../../utility-types' import { AbstractPool } from '../abstract-pool' import { @@ -19,8 +18,7 @@ export interface ClusterPoolOptions extends PoolOptions { * * @see https://nodejs.org/api/cluster.html#cluster_cluster_fork_env */ - // eslint-disable-next-line @typescript-eslint/no-explicit-any - env?: any + env?: Record /** * Cluster settings. * @@ -34,8 +32,6 @@ export interface ClusterPoolOptions extends PoolOptions { * * It is possible to perform tasks in sync or asynchronous mode as you prefer. * - * This pool selects the workers in a round robin fashion. - * * @typeParam Data - Type of data sent to the worker. This can only be serializable data. * @typeParam Response - Type of execution response. This can only be serializable data. * @author [Christopher Quadflieg](https://github.com/Shinigami92) @@ -55,7 +51,7 @@ export class FixedClusterPool< public constructor ( numberOfWorkers: number, filePath: string, - public readonly opts: ClusterPoolOptions = {} + protected readonly opts: ClusterPoolOptions = {} ) { super(numberOfWorkers, filePath, opts) } @@ -73,7 +69,10 @@ export class FixedClusterPool< /** @inheritDoc */ protected destroyWorker (worker: Worker): void { this.sendToWorker(worker, { kill: 1 }) - worker.kill() + worker.on('disconnect', () => { + worker.kill() + }) + worker.disconnect() } /** @inheritDoc */ @@ -101,7 +100,7 @@ export class FixedClusterPool< } /** @inheritDoc */ - public get type (): PoolType { + protected get type (): PoolType { return PoolTypes.fixed } @@ -120,11 +119,6 @@ export class FixedClusterPool< return this.numberOfWorkers } - /** @inheritDoc */ - protected get full (): boolean { - return this.workerNodes.length >= this.numberOfWorkers - } - /** @inheritDoc */ protected get busy (): boolean { return this.internalBusy()