From a611459b47003c454c1dcbc1966ff7a669b18089 Mon Sep 17 00:00:00 2001 From: "Hugo \"ThePooN\" Denizart" Date: Mon, 16 Oct 2023 03:02:04 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=9A=91=20Fix=20crash=20following=20th?= =?UTF-8?q?e=20merge=20of=20PR=20#17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Forgot to `git add` required changes. --- scthumbd.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scthumbd.js b/scthumbd.js index 188ed0d..ebb23f7 100644 --- a/scthumbd.js +++ b/scthumbd.js @@ -57,11 +57,13 @@ const thumber = scThumber({ const workers = process.env.WORKERS ?? os.cpus().length; const port = process.env.PORT ?? 4001; -if (cluster.isPrimary && workers > 1) { +if (cluster.isPrimary || workers <= 1) { console.log(`${'[m]'.red} ${'scthumbd %s'.yellow}`, process.env.npm_package_version); console.log(`${'[m]'.red} Listening on port ${'%s'.green}...`, port); - console.log(`${'[m]'.red} Starting ${'%s'.green} workers...`, workers); +} +if (cluster.isPrimary && workers > 1) { + console.log(`${'[m]'.red} Starting ${'%s'.green} workers...`, workers); for (let i = 0; i < workers; i++) { cluster.fork(); } @@ -81,5 +83,5 @@ if (cluster.isPrimary && workers > 1) { app.listen(port); - console.log(`${'[w]'.magenta} Worker ${'%s'.green} started...`, cluster.worker.id); + console.log(`${'[w]'.magenta} Worker ${'%s'.green} started...`, cluster.worker?.id || 0); } From f672715b782d916560d5a8f5e34363c30c21387b Mon Sep 17 00:00:00 2001 From: "Hugo \"ThePooN\" Denizart" Date: Mon, 16 Oct 2023 21:44:55 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A9=B9=20Apply=20suggestions=20from?= =?UTF-8?q?=20review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scthumbd.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scthumbd.js b/scthumbd.js index ebb23f7..bff020b 100644 --- a/scthumbd.js +++ b/scthumbd.js @@ -57,7 +57,7 @@ const thumber = scThumber({ const workers = process.env.WORKERS ?? os.cpus().length; const port = process.env.PORT ?? 4001; -if (cluster.isPrimary || workers <= 1) { +if (cluster.isPrimary) { console.log(`${'[m]'.red} ${'scthumbd %s'.yellow}`, process.env.npm_package_version); console.log(`${'[m]'.red} Listening on port ${'%s'.green}...`, port); } @@ -83,5 +83,5 @@ if (cluster.isPrimary && workers > 1) { app.listen(port); - console.log(`${'[w]'.magenta} Worker ${'%s'.green} started...`, cluster.worker?.id || 0); + console.log(`${'[w]'.magenta} Worker ${'%s'.green} started...`, cluster.worker?.id ?? 1); }