From 6b7f8edb96837f88ac1b5f20ca06041386d5c496 Mon Sep 17 00:00:00 2001 From: eternal-flame-AD Date: Sun, 17 Nov 2024 06:01:25 -0600 Subject: [PATCH] don't log metrics for postgres in testing Signed-off-by: eternal-flame-AD --- packages/backend/src/core/QueueModule.ts | 20 +++++++++++--------- packages/backend/src/postgres.ts | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/backend/src/core/QueueModule.ts b/packages/backend/src/core/QueueModule.ts index 3fb05cda3b..e5ab015585 100644 --- a/packages/backend/src/core/QueueModule.ts +++ b/packages/backend/src/core/QueueModule.ts @@ -31,16 +31,18 @@ export type UserWebhookDeliverQueue = Bull.Queue; export type SystemWebhookDeliverQueue = Bull.Queue; function withMetrics(queue: Bull.Queue): Bull.Queue { - setInterval(async () => { - mActiveJobs.set({ queue: queue.name }, await queue.getActiveCount()); - mDelayedJobs.set({ queue: queue.name }, await queue.getDelayedCount()); - mWaitingJobs.set({ queue: queue.name }, await queue.getWaitingCount()); - }, 2000); - - queue.on('waiting', () => { - mJobReceivedCounter.inc({ queue: queue.name }); - }); + if (process.env.NODE_ENV !== 'test') { + setInterval(async () => { + mActiveJobs.set({ queue: queue.name }, await queue.getActiveCount()); + mDelayedJobs.set({ queue: queue.name }, await queue.getDelayedCount()); + mWaitingJobs.set({ queue: queue.name }, await queue.getWaitingCount()); + }, 2000); + queue.on('waiting', () => { + mJobReceivedCounter.inc({ queue: queue.name }); + }); + } + return queue; } diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts index 6fce6a6faa..15707d3050 100644 --- a/packages/backend/src/postgres.ts +++ b/packages/backend/src/postgres.ts @@ -342,7 +342,8 @@ export function createPostgresDataSource(config: Config, isMain = false) { }, } : false, logging: log ? 'all' : ['query'], - logger: (isMain || log) ? new MyCustomLogger(!log) : undefined, + logger: process.env.NODE_ENV === 'test' ? undefined : + (isMain || log) ? new MyCustomLogger(!log) : undefined, maxQueryExecutionTime: 500, entities: entities, migrations: ['../../migration/*.js'],