mirror of
https://github.com/misskey-dev/misskey.git
synced 2024-12-23 00:29:22 +09:00
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.
This commit is contained in:
parent
dac3b1f405
commit
b9db1750d4
@ -18,15 +18,16 @@ export async function server() {
|
|||||||
logger: new NestLogger(),
|
logger: new NestLogger(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (process.env.NODE_ENV !== 'test') {
|
||||||
|
await app.get(ChartManagementService).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);
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -35,8 +36,8 @@ export async function jobQueue() {
|
|||||||
logger: new NestLogger(),
|
logger: new NestLogger(),
|
||||||
});
|
});
|
||||||
|
|
||||||
jobQueue.get(QueueProcessorService).start();
|
await jobQueue.get(QueueProcessorService).start();
|
||||||
jobQueue.get(ChartManagementService).start();
|
await jobQueue.get(ChartManagementService).start();
|
||||||
|
|
||||||
return jobQueue;
|
return jobQueue;
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ export class QueueStatsService implements OnApplicationShutdown {
|
|||||||
* Report queue stats regularly
|
* Report queue stats regularly
|
||||||
*/
|
*/
|
||||||
@bindThis
|
@bindThis
|
||||||
public start(): void {
|
public async start(): Promise<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;
|
||||||
};
|
};
|
||||||
|
|
||||||
tick();
|
await tick();
|
||||||
|
|
||||||
this.intervalId = setInterval(tick, interval);
|
this.intervalId = setInterval(tick, interval);
|
||||||
}
|
}
|
||||||
|
@ -68,7 +68,7 @@ export class ServerStatsService implements OnApplicationShutdown {
|
|||||||
if (log.length > 200) log.pop();
|
if (log.length > 200) log.pop();
|
||||||
};
|
};
|
||||||
|
|
||||||
tick();
|
await tick();
|
||||||
|
|
||||||
this.intervalId = setInterval(tick, interval);
|
this.intervalId = setInterval(tick, interval);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user