repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:poolifier/poolifier
[poolifier.git]
/
src
/
pools
/
cluster
/
fixed.ts
diff --git
a/src/pools/cluster/fixed.ts
b/src/pools/cluster/fixed.ts
index 522e7b672abb09feb5700f7a854a00234889b103..5f067bd7fb4a716f20297f2c907c7632a9607a1b 100644
(file)
--- a/
src/pools/cluster/fixed.ts
+++ b/
src/pools/cluster/fixed.ts
@@
-61,18
+61,20
@@
export class FixedClusterPool<
/** @inheritDoc */
protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
/** @inheritDoc */
protected async destroyWorkerNode (workerNodeKey: number): Promise<void> {
+ this.flagWorkerNodeAsNotReady(workerNodeKey)
this.flushTasksQueue(workerNodeKey)
// FIXME: wait for tasks to be finished
this.flushTasksQueue(workerNodeKey)
// FIXME: wait for tasks to be finished
- const worker = this.workerNodes[workerNodeKey].worker
+ const workerNode = this.workerNodes[workerNodeKey]
+ const worker = workerNode.worker
const waitWorkerExit = new Promise<void>(resolve => {
const waitWorkerExit = new Promise<void>(resolve => {
- worker.on('exit', () => {
+ worker.on
ce
('exit', () => {
resolve()
})
})
resolve()
})
})
- worker.on('disconnect', () => {
+ worker.on
ce
('disconnect', () => {
worker.kill()
})
worker.kill()
})
-
this.sendToWorker(workerNodeKey, { kill: true, workerId: worker.id }
)
+
await this.sendKillMessageToWorker(workerNodeKey
)
worker.disconnect()
await waitWorkerExit
}
worker.disconnect()
await waitWorkerExit
}
@@
-82,14
+84,16
@@
export class FixedClusterPool<
workerNodeKey: number,
message: MessageValue<Data>
): void {
workerNodeKey: number,
message: MessageValue<Data>
): void {
- this.workerNodes[workerNodeKey].worker.send(message)
+ this.workerNodes[workerNodeKey].worker.send({
+ ...message,
+ workerId: this.getWorkerInfo(workerNodeKey).id as number
+ })
}
/** @inheritDoc */
protected sendStartupMessageToWorker (workerNodeKey: number): void {
this.sendToWorker(workerNodeKey, {
}
/** @inheritDoc */
protected sendStartupMessageToWorker (workerNodeKey: number): void {
this.sendToWorker(workerNodeKey, {
- ready: false,
- workerId: this.workerNodes[workerNodeKey].worker.id
+ ready: false
})
}
})
}
@@
-102,28
+106,34
@@
export class FixedClusterPool<
}
/** @inheritDoc */
}
/** @inheritDoc */
- protected createWorker (): Worker {
- return cluster.fork(this.opts.env)
+ protected registerOnceWorkerMessageListener<Message extends Data | Response>(
+ workerNodeKey: number,
+ listener: (message: MessageValue<Message>) => void
+ ): void {
+ this.workerNodes[workerNodeKey].worker.once('message', listener)
}
/** @inheritDoc */
}
/** @inheritDoc */
- protected get type (): PoolType {
- return PoolTypes.fixed
+ protected deregisterWorkerMessageListener<Message extends Data | Response>(
+ workerNodeKey: number,
+ listener: (message: MessageValue<Message>) => void
+ ): void {
+ this.workerNodes[workerNodeKey].worker.off('message', listener)
}
/** @inheritDoc */
}
/** @inheritDoc */
- protected
get worker (): WorkerType
{
- return
WorkerTypes.cluster
+ protected
createWorker (): Worker
{
+ return
cluster.fork(this.opts.env)
}
/** @inheritDoc */
}
/** @inheritDoc */
- protected get
minSize (): number
{
- return
this.numberOfWorkers
+ protected get
type (): PoolType
{
+ return
PoolTypes.fixed
}
/** @inheritDoc */
}
/** @inheritDoc */
- protected get
maxSize (): number
{
- return
this.numberOfWorkers
+ protected get
worker (): WorkerType
{
+ return
WorkerTypes.cluster
}
/** @inheritDoc */
}
/** @inheritDoc */