1
0
mirror of https://git.boykissers.com/pawkey/pawkey-sk.git synced 2025-12-20 04:04:16 +00:00

Merge branch 'develop' into feature/misskey-2024.07

fixing conflicts in `package.json`
This commit is contained in:
dakkar
2024-08-06 10:35:14 +01:00
12 changed files with 49 additions and 21 deletions

View File

@@ -112,6 +112,11 @@ export async function masterMain() {
await server();
}
if (config.clusterLimit === 0) {
bootLogger.error("Configuration error: we can't create workers, `config.clusterLimit` is 0 (if you don't want to use clustering, set the environment variable `MK_DISABLE_CLUSTERING` to a non-empty value instead)", null, true);
process.exit(1);
}
await spawnWorkers(config.clusterLimit);
}
@@ -180,7 +185,10 @@ async function connectDb(): Promise<void> {
*/
async function spawnWorkers(limit = 1) {
const workers = Math.min(limit, os.cpus().length);
const cpuCount = os.cpus().length;
// in some weird environments, node can't count the CPUs; we trust the config in those cases
const workers = cpuCount === 0 ? limit : Math.min(limit, cpuCount);
bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
await Promise.all([...Array(workers)].map(spawnWorker));
bootLogger.succ('All workers started');