Skip to content

Commit

Permalink
fix(worker): make sure clearTimeout is always called after bzpopmin
Browse files Browse the repository at this point in the history
  • Loading branch information
manast committed May 1, 2024
1 parent b37edfe commit 782382e
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/classes/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ will never work with more accuracy than 1ms. */
return Infinity;
}

let timeout: NodeJS.Timeout;
try {
if (!this.closing) {
let blockTimeout = this.getBlockTimeout(blockUntil);
Expand All @@ -629,7 +630,7 @@ will never work with more accuracy than 1ms. */
// We cannot trust that the blocking connection stays blocking forever
// due to issues in Redis and IORedis, so we will reconnect if we
// don't get a response in the expected time.
const timeout = setTimeout(async () => {
timeout = setTimeout(async () => {
await this.blockingConnection.disconnect();
await this.blockingConnection.reconnect();
}, blockTimeout * 1000 + 1000);
Expand All @@ -639,7 +640,6 @@ will never work with more accuracy than 1ms. */
// Markers should only be used for un-blocking, so we will handle them in this
// function only.
const result = await bclient.bzpopmin(this.keys.marker, blockTimeout);
clearTimeout(timeout);

if (result) {
const [_key, member, score] = result;
Expand All @@ -659,6 +659,8 @@ will never work with more accuracy than 1ms. */
if (!this.closing) {
await this.delay();
}
} finally {
clearTimeout(timeout);
}
return Infinity;
}
Expand Down

0 comments on commit 782382e

Please sign in to comment.