X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fcluster%2Ffixed.ts;h=a88197f715bdd2c2a129638d3960dce9d9ac8420;hb=75d3401a50550a9fc53e2e7d107bc2d776df83e3;hp=0ca0250cecdf4d02f712c5fee30ce699701ba58f;hpb=8881ae32256c9a9ebe6d78c95672f610a3f46719;p=poolifier.git diff --git a/src/pools/cluster/fixed.ts b/src/pools/cluster/fixed.ts index 0ca0250c..a88197f7 100644 --- a/src/pools/cluster/fixed.ts +++ b/src/pools/cluster/fixed.ts @@ -18,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. * @@ -31,12 +30,8 @@ export interface ClusterPoolOptions extends PoolOptions { /** * A cluster pool with a fixed number of workers. * - * 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. + * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data. + * @typeParam Response - Type of execution response. This can only be structured-cloneable data. * @author [Christopher Quadflieg](https://github.com/Shinigami92) * @since 2.0.0 */ @@ -54,7 +49,7 @@ export class FixedClusterPool< public constructor ( numberOfWorkers: number, filePath: string, - public readonly opts: ClusterPoolOptions = {} + protected readonly opts: ClusterPoolOptions = {} ) { super(numberOfWorkers, filePath, opts) } @@ -72,7 +67,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 */ @@ -80,25 +78,11 @@ export class FixedClusterPool< worker.send(message) } - /** @inheritDoc */ - protected registerWorkerMessageListener( - worker: Worker, - listener: (message: MessageValue) => void - ): void { - worker.on('message', listener) - } - /** @inheritDoc */ protected createWorker (): Worker { return cluster.fork(this.opts.env) } - /** @inheritDoc */ - protected afterWorkerSetup (worker: Worker): void { - // Listen to worker messages. - this.registerWorkerMessageListener(worker, super.workerListener()) - } - /** @inheritDoc */ protected get type (): PoolType { return PoolTypes.fixed @@ -119,11 +103,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()