Revert "Synchronize server startup"

This reverts commit 2c4fc485e4.
This commit is contained in:
fly_mc 2024-12-16 09:24:12 +08:00
parent 77d19e0597
commit 7bff7962a6
3 changed files with 11 additions and 15 deletions

View file

@ -12,25 +12,21 @@ import { QueueStatsService } from '@/daemons/QueueStatsService.js';
import { ServerStatsService } from '@/daemons/ServerStatsService.js'; import { ServerStatsService } from '@/daemons/ServerStatsService.js';
import { ServerService } from '@/server/ServerService.js'; import { ServerService } from '@/server/ServerService.js';
import { MainModule } from '@/MainModule.js'; import { MainModule } from '@/MainModule.js';
import { envOption } from '@/env.js';
export async function server() { export async function server() {
const app = await NestFactory.createApplicationContext(MainModule, { const app = await NestFactory.createApplicationContext(MainModule, {
logger: new NestLogger(), 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); const serverService = app.get(ServerService);
await serverService.launch(); await serverService.launch();
if (process.env.NODE_ENV !== 'test') {
app.get(ChartManagementService).start();
app.get(QueueStatsService).start();
app.get(ServerStatsService).start();
}
return app; return app;
} }
@ -39,8 +35,8 @@ export async function jobQueue() {
logger: new NestLogger(), logger: new NestLogger(),
}); });
await jobQueue.get(QueueProcessorService).start(); jobQueue.get(QueueProcessorService).start();
await jobQueue.get(ChartManagementService).start(); jobQueue.get(ChartManagementService).start();
return jobQueue; return jobQueue;
} }

View file

@ -33,7 +33,7 @@ export class QueueStatsService implements OnApplicationShutdown {
* Report queue stats regularly * Report queue stats regularly
*/ */
@bindThis @bindThis
public async start(): Promise<void> { public start(): void {
const log = [] as any[]; const log = [] as any[];
ev.on('requestQueueStatsLog', x => { ev.on('requestQueueStatsLog', x => {
@ -82,7 +82,7 @@ export class QueueStatsService implements OnApplicationShutdown {
activeInboxJobs = 0; activeInboxJobs = 0;
}; };
await tick(); tick();
this.intervalId = setInterval(tick, interval); this.intervalId = setInterval(tick, interval);
} }

View file

@ -68,7 +68,7 @@ export class ServerStatsService implements OnApplicationShutdown {
if (log.length > 200) log.pop(); if (log.length > 200) log.pop();
}; };
await tick(); tick();
this.intervalId = setInterval(tick, interval); this.intervalId = setInterval(tick, interval);
} }