From 465c780a041fcac576db1acfded97147b9abd5de Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 19 Dec 2024 11:22:54 -0500 Subject: [PATCH] Revert "Synchronize server startup" This reverts commit ffbdfa912388c705ac288b68f45aa31fc9e75c40. --- packages/backend/src/boot/common.ts | 21 +++++++++---------- .../backend/src/daemons/QueueStatsService.ts | 4 ++-- .../backend/src/daemons/ServerStatsService.ts | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/backend/src/boot/common.ts b/packages/backend/src/boot/common.ts index 9ff1efb3c2..ad59a55688 100644 --- a/packages/backend/src/boot/common.ts +++ b/packages/backend/src/boot/common.ts @@ -19,18 +19,17 @@ export async function server() { logger: new NestLogger(), }); - if (process.env.NODE_ENV !== 'test') { - await app.get(ChartManagementService).start(); - } - if (!envOption.noDaemons) { - 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(); + if (process.env.NODE_ENV !== 'test') { + app.get(ChartManagementService).start(); + } + if (!envOption.noDaemons) { + app.get(QueueStatsService).start(); + app.get(ServerStatsService).start(); + } + return app; } @@ -39,8 +38,8 @@ export async function jobQueue() { logger: new NestLogger(), }); - await jobQueue.get(QueueProcessorService).start(); - await jobQueue.get(ChartManagementService).start(); + jobQueue.get(QueueProcessorService).start(); + jobQueue.get(ChartManagementService).start(); return jobQueue; } diff --git a/packages/backend/src/daemons/QueueStatsService.ts b/packages/backend/src/daemons/QueueStatsService.ts index 77fcd71337..ede104b9fe 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 async start(): Promise { + public start(): void { const log = [] as any[]; ev.on('requestQueueStatsLog', x => { @@ -82,7 +82,7 @@ export class QueueStatsService implements OnApplicationShutdown { activeInboxJobs = 0; }; - await tick(); + tick(); this.intervalId = setInterval(tick, interval); } diff --git a/packages/backend/src/daemons/ServerStatsService.ts b/packages/backend/src/daemons/ServerStatsService.ts index 2ab087477a..6e9d29dcbd 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(); }; - await tick(); + tick(); this.intervalId = setInterval(tick, interval); }