X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fworker%2Fabstract-worker.ts;h=8e55b30152fc60fb47a403ad31c44e7fc32457dd;hb=8a9febf5f5d99c234d1b89879ff2d6655af7d65f;hp=2afd6f3486a1103347a258c575cece7773e3c4d3;hpb=0e05c4dc968e27cf71ef2ab266feb57d9d1bade9;p=poolifier.git diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts index 2afd6f34..8e55b301 100644 --- a/src/worker/abstract-worker.ts +++ b/src/worker/abstract-worker.ts @@ -71,10 +71,7 @@ export abstract class AbstractWorker< super(type) this.checkWorkerOptions(this.opts) this.checkTaskFunctions(taskFunctions) - if ( - !this.isMain && - (this.opts.maxInactiveTime ?? DEFAULT_MAX_INACTIVE_TIME) > 0 - ) { + if (!this.isMain) { this.lastTaskTimestamp = performance.now() this.aliveInterval = setInterval( this.checkAlive.bind(this), @@ -215,13 +212,17 @@ export abstract class AbstractWorker< const runTime = performance.now() - startTimestamp this.sendToMainWorker({ data: res, - id: message.id, runTime, - waitTime + waitTime, + id: message.id }) } catch (e) { const err = this.handleError(e as Error) - this.sendToMainWorker({ error: err, id: message.id }) + this.sendToMainWorker({ + error: err, + errorData: message.data, + id: message.id + }) } finally { !this.isMain && (this.lastTaskTimestamp = performance.now()) } @@ -244,15 +245,19 @@ export abstract class AbstractWorker< const runTime = performance.now() - startTimestamp this.sendToMainWorker({ data: res, - id: message.id, runTime, - waitTime + waitTime, + id: message.id }) return null }) .catch(e => { const err = this.handleError(e as Error) - this.sendToMainWorker({ error: err, id: message.id }) + this.sendToMainWorker({ + error: err, + errorData: message.data, + id: message.id + }) }) .finally(() => { !this.isMain && (this.lastTaskTimestamp = performance.now())