repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
chore: v2.6.11
[poolifier.git]
/
src
/
worker
/
abstract-worker.ts
diff --git
a/src/worker/abstract-worker.ts
b/src/worker/abstract-worker.ts
index 4e92be01ae340da26d4699595ff692566075f006..8122f909af89d93e76d5a0c1730e19323b3391da 100644
(file)
--- a/
src/worker/abstract-worker.ts
+++ b/
src/worker/abstract-worker.ts
@@
-148,13
+148,17
@@
export abstract class AbstractWorker<
if (message.ready != null && message.workerId === this.id) {
// Startup message received
this.workerReady()
if (message.ready != null && message.workerId === this.id) {
// Startup message received
this.workerReady()
- } else if (message.statistics != null) {
+ } else if (message.statistics != null
&& message.workerId === this.id
) {
// Statistics message received
this.statistics = message.statistics
// Statistics message received
this.statistics = message.statistics
- } else if (message.checkAlive != null) {
+ } else if (message.checkAlive != null
&& message.workerId === this.id
) {
// Check alive message received
message.checkAlive ? this.startCheckAlive() : this.stopCheckAlive()
// Check alive message received
message.checkAlive ? this.startCheckAlive() : this.stopCheckAlive()
- } else if (message.id != null && message.data != null) {
+ } else if (
+ message.id != null &&
+ message.data != null &&
+ message.workerId === this.id
+ ) {
// Task message received
const fn = this.getTaskFunction(message.name)
if (isAsyncFunction(fn)) {
// Task message received
const fn = this.getTaskFunction(message.name)
if (isAsyncFunction(fn)) {
@@
-162,7
+166,7
@@
export abstract class AbstractWorker<
} else {
this.runInAsyncScope(this.runSync.bind(this), this, fn, message)
}
} else {
this.runInAsyncScope(this.runSync.bind(this), this, fn, message)
}
- } else if (message.kill === true) {
+ } else if (message.kill === true
&& message.workerId === this.id
) {
// Kill message received
this.stopCheckAlive()
this.emitDestroy()
// Kill message received
this.stopCheckAlive()
this.emitDestroy()
@@
-203,7
+207,7
@@
export abstract class AbstractWorker<
performance.now() - this.lastTaskTimestamp >
(this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME)
) {
performance.now() - this.lastTaskTimestamp >
(this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME)
) {
- this.sendToMainWorker({ kill: this.opts.killBehavior })
+ this.sendToMainWorker({ kill: this.opts.killBehavior
, workerId: this.id
})
}
}
}
}
@@
-262,10
+266,10
@@
export abstract class AbstractWorker<
const errorMessage = this.handleError(e as Error | string)
this.sendToMainWorker({
taskError: {
const errorMessage = this.handleError(e as Error | string)
this.sendToMainWorker({
taskError: {
- workerId: this.id,
message: errorMessage,
data: message.data
},
message: errorMessage,
data: message.data
},
+ workerId: this.id,
id: message.id
})
} finally {
id: message.id
})
} finally {
@@
-301,10
+305,10
@@
export abstract class AbstractWorker<
const errorMessage = this.handleError(e as Error | string)
this.sendToMainWorker({
taskError: {
const errorMessage = this.handleError(e as Error | string)
this.sendToMainWorker({
taskError: {
- workerId: this.id,
message: errorMessage,
data: message.data
},
message: errorMessage,
data: message.data
},
+ workerId: this.id,
id: message.id
})
})
id: message.id
})
})