Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Better BullMQ queue creation

Edward Cui3241641ed85b
diff --git a/server/src/queues/adapters/bullMQAdapter.ts b/server/src/queues/adapters/bullMQAdapter.ts
index 2c3f8ae68..beef9d541 100644
--- a/server/src/queues/adapters/bullMQAdapter.ts
+++ b/server/src/queues/adapters/bullMQAdapter.ts
@@ -74,32 +74,66 @@ export class BullMQAdapter implements IJobQueue {
async createQueue(queueName: string): Promise<void> {
if (!this.queues.has(queueName)) {
- const queue = new Queue(queueName, {
- connection: this.connection,
- defaultJobOptions: {
- attempts: 1, // No retries, same as pg-boss
- removeOnComplete: true,
- removeOnFail: false, // Keep failed jobs for debugging
- },
- });
-
- this.queues.set(queueName, queue);
-
- // Create QueueEvents for monitoring
- const queueEvents = new QueueEvents(queueName, {
- connection: this.connection,
- });
-
- this.queueEvents.set(queueName, queueEvents);
-
- // Log job events
- queueEvents.on("completed", ({ jobId }) => {
- console.info(`[BullMQ] Job ${jobId} completed in queue ${queueName}`);
- });
-
- queueEvents.on("failed", ({ jobId, failedReason }) => {
- console.error(`[BullMQ] Job ${jobId} failed in queue ${queueName}:`, failedReason);
- });
+ let queue: Queue | undefined;
+ let queueEvents: QueueEvents | undefined;
+
+ try {
+ // Create Queue
+ queue = new Queue(queueName, {
+ connection: this.connection,
+ defaultJobOptions: {
+ attempts: 1, // No retries, same as pg-boss
+ removeOnComplete: true,
+ removeOnFail: false, // Keep failed jobs for debugging
+ },
+ });
+
+ this.queues.set(queueName, queue);
+
+ // Create QueueEvents for monitoring
+ queueEvents = new QueueEvents(queueName, {
+ connection: this.connection,
+ });
+
+ this.queueEvents.set(queueName, queueEvents);
+
+ // Log job events
+ queueEvents.on("completed", ({ jobId }) => {
+ console.info(`[BullMQ] Job ${jobId} completed in queue ${queueName}`);
+ });
+
+ queueEvents.on("failed", ({ jobId, failedReason }) => {
+ console.error(`[BullMQ] Job ${jobId} failed in queue ${queueName}:`, failedReason);
+ });
+ } catch (error) {
+ console.error(`[BullMQ] Failed to create queue ${queueName}:`, error);
+
+ // Clean up any partially created resources
+ const cleanupPromises: Promise<void>[] = [];
+
+ if (queueEvents) {
+ this.queueEvents.delete(queueName);
+ cleanupPromises.push(
+ queueEvents.close().catch(closeError => {
+ console.error(`[BullMQ] Failed to close queue events during cleanup for ${queueName}:`, closeError);
+ })
+ );
+ }
+
+ if (queue) {
+ this.queues.delete(queueName);
+ cleanupPromises.push(
+ queue.close().catch(closeError => {
+ console.error(`[BullMQ] Failed to close queue during cleanup for ${queueName}:`, closeError);
+ })
+ );
+ }
+
+ // Wait for cleanup to complete before rethrowing
+ await Promise.all(cleanupPromises);
+
+ throw error;
+ }
}
}