Skip to content

Commit 41acf6b

Browse files
committed
refactor: refine waitWorkerNodeEvents() API
Signed-off-by: Jérôme Benoit <[email protected]>
1 parent 5bd7a88 commit 41acf6b

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

src/pools/abstract-pool.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,7 @@ export abstract class AbstractPool<
13951395
getDefaultTasksQueueOptions(
13961396
this.maximumNumberOfWorkers ?? this.minimumNumberOfWorkers,
13971397
).tasksFinishedTimeout,
1398+
false,
13981399
)
13991400
await this.sendKillMessageToWorker(workerNodeKey)
14001401
workerNode.terminate()

src/pools/utils.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ export const waitWorkerNodeEvents = async <
462462
workerNodeEvent: string,
463463
numberOfEventsToWait: number,
464464
timeout: number,
465+
timeoutRejection: boolean = true,
465466
): Promise<number> => {
466467
return await new Promise<number>((resolve, reject) => {
467468
let events = 0
@@ -480,7 +481,13 @@ export const waitWorkerNodeEvents = async <
480481
const timeoutHandle = timeout >= 0
481482
? setTimeout(() => {
482483
workerNode.removeEventListener(workerNodeEvent, listener)
483-
resolve(events)
484+
timeoutRejection
485+
? reject(
486+
new Error(
487+
`Timed out after ${timeout.toString()}ms waiting for ${numberOfEventsToWait.toString()} '${workerNodeEvent}' events. Received ${events.toString()} events`,
488+
),
489+
)
490+
: resolve(events)
484491
}, timeout)
485492
: undefined
486493
switch (workerNodeEvent) {

tests/test-utils.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const waitWorkerNodeEvents = async (
1919
})
2020
reject(
2121
new Error(
22-
`Timed out after ${timeoutMs}ms waiting for ${numberOfEventsToWait} '${workerNodeEvent}' events. Received ${events}.`,
22+
`Timed out after ${timeoutMs.toString()}ms waiting for ${numberOfEventsToWait.toString()} '${workerNodeEvent}' events. Received ${events.toString()} events`,
2323
),
2424
)
2525
}, timeoutMs)

0 commit comments

Comments
 (0)