X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fcluster-worker.ts;h=b22c50fe4160a17ac83b1a525df8090ac1ae9538;hb=bb379737d9bdc595e5265c63c327260b9d15a201;hp=16dddd2969bd50193c4fb43e762d607f08f4ca08;hpb=53b1b2fc0c935c958a4b6a36223dbdc44c24d926;p=poolifier.git diff --git a/src/worker/cluster-worker.ts b/src/worker/cluster-worker.ts index 16dddd29..b22c50fe 100644 --- a/src/worker/cluster-worker.ts +++ b/src/worker/cluster-worker.ts @@ -2,7 +2,7 @@ import cluster, { type Worker } from 'node:cluster' import type { MessageValue } from '../utility-types' import { AbstractWorker } from './abstract-worker' import type { WorkerOptions } from './worker-options' -import type { TaskFunctions, WorkerFunction } from './worker-functions' +import type { TaskFunction, TaskFunctions } from './task-functions' /** * A cluster worker used by a poolifier `ClusterPool`. @@ -29,20 +29,24 @@ export class ClusterWorker< * @param opts - Options for the worker. */ public constructor ( - taskFunctions: - | WorkerFunction - | TaskFunctions, + taskFunctions: TaskFunction | TaskFunctions, opts: WorkerOptions = {} ) { super( 'worker-cluster-pool:poolifier', cluster.isPrimary, - taskFunctions, cluster.worker as Worker, + taskFunctions, opts ) - if (!this.isMain) { - this.sendToMainWorker({ workerId: this.id, started: true }) + } + + /** @inheritDoc */ + protected handleReadyMessage (message: MessageValue): void { + if (message.workerId === this.id && message.ready != null) { + this.getMainWorker()?.on('message', this.messageListener.bind(this)) + this.sendTaskFunctionsListToMainWorker() + this.sendToMainWorker({ ready: true, workerId: this.id }) } } @@ -53,12 +57,6 @@ export class ClusterWorker< /** @inheritDoc */ protected sendToMainWorker (message: MessageValue): void { - console.log('sending message to main worker(cluster)', message) this.getMainWorker().send(message) } - - /** @inheritDoc */ - protected handleError (e: Error | string): string { - return e instanceof Error ? e.message : e - } }