From 0dca6afa1f1d5d62dc9735cf7e5ec5ce12df34c6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 17 Sep 2023 15:43:50 +0900
Subject: fix(backend):
 MK_ONLY_SERVERオプションを指定した際にクラッシュする問題を修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix: #11811
---
 packages/backend/src/boot/master.ts | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'packages')

diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 0bf23c770b..a45ea2bb8f 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -68,21 +68,34 @@ export async function masterMain() {
 		process.exit(1);
 	}
 
-	if (envOption.onlyServer) {
-		await server();
-	} else if (envOption.onlyQueue) {
-		await jobQueue();
-	} else {
-		await server();
-	}
-
 	bootLogger.succ('Misskey initialized');
 
-	if (!envOption.disableClustering) {
+	if (envOption.disableClustering) {
+		if (envOption.onlyServer) {
+			await server();
+		} else if (envOption.onlyQueue) {
+			await jobQueue();
+		} else {
+			await server();
+			await jobQueue();
+		}
+	} else {
+		if (envOption.onlyServer) {
+			// nop
+		} else if (envOption.onlyQueue) {
+			// nop
+		} else {
+			await server();
+		}
+
 		await spawnWorkers(config.clusterLimit);
 	}
 
-	bootLogger.succ(config.socket ? `Now listening on socket ${config.socket} on ${config.url}` : `Now listening on port ${config.port} on ${config.url}`, null, true);
+	if (envOption.onlyQueue) {
+		bootLogger.succ('Queue started', null, true);
+	} else {
+		bootLogger.succ(config.socket ? `Now listening on socket ${config.socket} on ${config.url}` : `Now listening on port ${config.port} on ${config.url}`, null, true);
+	}
 }
 
 function showEnvironment(): void {
-- 
cgit v1.2.3-freya