Skip to content

The open alternative to Salesforce, designed for AI.

feat(server): drain queue workers gracefully on SIGTERM (#22514)

Félix Malfaite5fc1b3702a6
diff --git a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/bullmq.driver.ts b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/bullmq.driver.ts
index 258760ba67c..8770297de49 100644
--- a/packages/twenty-server/src/engine/core-modules/message-queue/drivers/bullmq.driver.ts
+++ b/packages/twenty-server/src/engine/core-modules/message-queue/drivers/bullmq.driver.ts
@@ -89,13 +89,40 @@ export class BullMQDriver
}
async onModuleDestroy() {
- const workers = Object.values(this.workerMap);
+ const workers = Object.entries(this.workerMap);
const queues = Object.values(this.queueMap);
- await Promise.all([
- ...queues.map((q) => q.close()),
- ...workers.map((w) => w.close()),
- ]);
+ if (workers.length > 0) {
+ this.logger.log(
+ `Draining active jobs on queues: ${workers.map(([queueName]) => queueName).join(', ')}`,
+ );
+ }
+
+ let workerCloseError: unknown;
+
+ try {
+ await Promise.all(workers.map(([, worker]) => worker.close()));
+ } catch (error) {
+ workerCloseError = error;
+ }
+
+ try {
+ await Promise.all(queues.map((queue) => queue.close()));
+ } catch (error) {
+ if (!isDefined(workerCloseError)) {
+ throw error;
+ }
+
+ this.logger.error(
+ `Failed to close queues during shutdown: ${error instanceof Error ? error.message : String(error)}`,
+ );
+ }
+
+ if (isDefined(workerCloseError)) {
+ throw workerCloseError;
+ }
+
+ this.logger.log('Message queue shutdown complete');
}
work<T>(
diff --git a/packages/twenty-server/src/queue-worker/queue-worker.ts b/packages/twenty-server/src/queue-worker/queue-worker.ts
index 68bec8617dc..efae3f64c94 100644
--- a/packages/twenty-server/src/queue-worker/queue-worker.ts
+++ b/packages/twenty-server/src/queue-worker/queue-worker.ts
@@ -20,6 +20,8 @@ async function bootstrap() {
// Inject our logger
app.useLogger(loggerService ?? false);
+
+ app.enableShutdownHooks();
} catch (err) {
loggerService?.error(err?.message, err?.name);