Skip to content

fix: Allow queue to recover from some errors #36256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 5 commits into from
Jun 21, 2025
Merged

fix: Allow queue to recover from some errors #36256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75a64d7
allow queue to reschedule on external errors
KevLehman Jun 19, 2025
3a97d71
Create thirty-needles-speak.md
KevLehman Jun 19, 2025
574c46d
Merge branch 'develop' into fix/queue-on-error
kodiakhq[bot] Jun 20, 2025
1f3fa47
Merge branch 'develop' into fix/queue-on-error
KevLehman Jun 21, 2025
264c8a2
Merge branch 'develop' into fix/queue-on-error
KevLehman Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/thirty-needles-speak.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes an issue that caused the queue worker to stop processing if something failed when checking MAC limits or while fetching the list of queues
63 changes: 39 additions & 24 deletions apps/meteor/server/services/omnichannel/queue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export class OmnichannelQueue implements IOmnichannelQueue {

private running = false;

private errorDelay = 10 * 1000; // 10 seconds

private delay() {
const timeout = settings.get<number>('Omnichannel_queue_delay_timeout') ?? 5;
return timeout < 1 ? DEFAULT_RACE_TIMEOUT : timeout * 1000;
Expand Down Expand Up @@ -79,28 +81,38 @@ export class OmnichannelQueue implements IOmnichannelQueue {
}

private async execute() {
if (!this.running) {
queueLogger.debug('Queue stopped. Cannot execute');
return;
}
try {
if (!this.running) {
queueLogger.debug('Queue stopped. Cannot execute');
return;
}

if (await License.shouldPreventAction('monthlyActiveContacts', 1)) {
queueLogger.debug('MAC limit reached. Queue wont execute');
this.running = false;
return;
}
if (await License.shouldPreventAction('monthlyActiveContacts', 1)) {
queueLogger.debug('MAC limit reached. Queue wont execute');
this.running = false;
return;
}

// We still go 1 by 1, but we go with every queue every cycle instead of just 1 queue per cycle
// And we get tracing :)
const queues = await this.getActiveQueues();
for await (const queue of queues) {
await tracerSpan(
'omnichannel.queue',
{ attributes: { workerTime: new Date().toISOString(), queue: queue || 'Public' }, root: true },
() => this.checkQueue(queue),
);
}

// We still go 1 by 1, but we go with every queue every cycle instead of just 1 queue per cycle
// And we get tracing :)
const queues = await this.getActiveQueues();
for await (const queue of queues) {
await tracerSpan(
'omnichannel.queue',
{ attributes: { workerTime: new Date().toISOString(), queue: queue || 'Public' }, root: true },
() => this.checkQueue(queue),
);
this.scheduleExecution();
} catch (e) {
queueLogger.error({
msg: 'Queue Worker Error. Rescheduling with extra delay',
extraDelay: this.errorDelay,
err: e,
});
this.scheduleExecution(this.errorDelay);
}
this.scheduleExecution();
}

private async checkQueue(queue: string | null) {
Expand Down Expand Up @@ -136,15 +148,18 @@ export class OmnichannelQueue implements IOmnichannelQueue {
}
}

private scheduleExecution(): void {
private scheduleExecution(extraDelay?: number): void {
if (this.timeoutHandler !== null) {
return;
}

this.timeoutHandler = setTimeout(() => {
this.timeoutHandler = null;
return this.execute();
}, this.delay());
this.timeoutHandler = setTimeout(
() => {
this.timeoutHandler = null;
return this.execute();
},
this.delay() + (extraDelay || 0),
);
}

async shouldStart() {
Expand Down
Loading