From 8d8713bad683aaa67c1cac5305cfd979a9ff697c Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 27 Nov 2024 22:10:50 -0500 Subject: [PATCH 1/2] restore functionality of `MK_NO_DAEMONS` option --- packages/backend/src/boot/common.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/backend/src/boot/common.ts b/packages/backend/src/boot/common.ts index 268c07582d..ad59a55688 100644 --- a/packages/backend/src/boot/common.ts +++ b/packages/backend/src/boot/common.ts @@ -12,6 +12,7 @@ import { QueueStatsService } from '@/daemons/QueueStatsService.js'; import { ServerStatsService } from '@/daemons/ServerStatsService.js'; import { ServerService } from '@/server/ServerService.js'; import { MainModule } from '@/MainModule.js'; +import { envOption } from '@/env.js'; export async function server() { const app = await NestFactory.createApplicationContext(MainModule, { @@ -23,6 +24,8 @@ export async function server() { if (process.env.NODE_ENV !== 'test') { app.get(ChartManagementService).start(); + } + if (!envOption.noDaemons) { app.get(QueueStatsService).start(); app.get(ServerStatsService).start(); } From c8bfe60237976902d7c04a1892d76363a5a7ac25 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 27 Nov 2024 23:19:14 -0500 Subject: [PATCH 2/2] Synchronize server startup This prevents an edge case where the server begins processing inbound API / AP requests before any of the chart / management daemons are ready, potentially leading to incorrect chart statistics. --- packages/backend/src/boot/common.ts | 17 +++++++++-------- .../backend/src/daemons/QueueStatsService.ts | 4 ++-- .../backend/src/daemons/ServerStatsService.ts | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/backend/src/boot/common.ts b/packages/backend/src/boot/common.ts index ad59a55688..9ff1efb3c2 100644 --- a/packages/backend/src/boot/common.ts +++ b/packages/backend/src/boot/common.ts @@ -19,17 +19,18 @@ export async function server() { logger: new NestLogger(), }); - const serverService = app.get(ServerService); - await serverService.launch(); - if (process.env.NODE_ENV !== 'test') { - app.get(ChartManagementService).start(); + await app.get(ChartManagementService).start(); } if (!envOption.noDaemons) { - app.get(QueueStatsService).start(); - app.get(ServerStatsService).start(); + await app.get(QueueStatsService).start(); + await app.get(ServerStatsService).start(); } + // Start server last so the other services can register hooks first + const serverService = app.get(ServerService); + await serverService.launch(); + return app; } @@ -38,8 +39,8 @@ export async function jobQueue() { logger: new NestLogger(), }); - jobQueue.get(QueueProcessorService).start(); - jobQueue.get(ChartManagementService).start(); + await jobQueue.get(QueueProcessorService).start(); + await jobQueue.get(ChartManagementService).start(); return jobQueue; } diff --git a/packages/backend/src/daemons/QueueStatsService.ts b/packages/backend/src/daemons/QueueStatsService.ts index ede104b9fe..77fcd71337 100644 --- a/packages/backend/src/daemons/QueueStatsService.ts +++ b/packages/backend/src/daemons/QueueStatsService.ts @@ -33,7 +33,7 @@ export class QueueStatsService implements OnApplicationShutdown { * Report queue stats regularly */ @bindThis - public start(): void { + public async start(): Promise { const log = [] as any[]; ev.on('requestQueueStatsLog', x => { @@ -82,7 +82,7 @@ export class QueueStatsService implements OnApplicationShutdown { activeInboxJobs = 0; }; - tick(); + await tick(); this.intervalId = setInterval(tick, interval); } diff --git a/packages/backend/src/daemons/ServerStatsService.ts b/packages/backend/src/daemons/ServerStatsService.ts index 6e9d29dcbd..2ab087477a 100644 --- a/packages/backend/src/daemons/ServerStatsService.ts +++ b/packages/backend/src/daemons/ServerStatsService.ts @@ -68,7 +68,7 @@ export class ServerStatsService implements OnApplicationShutdown { if (log.length > 200) log.pop(); }; - tick(); + await tick(); this.intervalId = setInterval(tick, interval); }