merge upstream 2025-02-03

packages/backend/src/boot/entry.ts

@@ -70,14 +70,22 @@ async function main() {
 	});
 	//#endregion
 
-	if (cluster.isPrimary || envOption.disableClustering) {
-		await masterMain();
+	if (!envOption.disableClustering) {
 		if (cluster.isPrimary) {
+			logger.info(`Start main process... pid: ${process.pid}`);
+			await masterMain();
 			ev.mount();
+		} else if (cluster.isWorker) {
+			logger.info(`Start worker process... pid: ${process.pid}`);
+			await workerMain();
+		} else {
+			throw new Error('Unknown process type');
 		}
-	}
-	if (cluster.isWorker) {
-		await workerMain();
+	} else {
+		// 非clusterの場合はMasterのみが起動するため、Workerの処理は行わない(cluster.isWorker === trueの状態でこのブロックに来ることはない)
+		logger.info(`Start main process... pid: ${process.pid}`);
+		await masterMain();
+		ev.mount();
 	}
 
 	readyRef.value = true;