From 69df556ff5ebf556069cbc649bc40a790632d3f5 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 8 Mar 2019 04:55:55 +0900
Subject: [PATCH] Resolve #4448

---
 src/index.ts | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index a4a15b339..c6ac7b175 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -117,9 +117,6 @@ async function masterMain() {
 		await spawnWorkers(config.clusterLimit);
 	}
 
-	// start queue
-	require('./queue').default();
-
 	bootLogger.succ(`Now listening on port ${config.port} on ${config.url}`, null, true);
 }
 
@@ -130,6 +127,9 @@ async function workerMain() {
 	// start server
 	await require('./server').default();
 
+	// start job queue
+	require('./queue').default();
+
 	if (cluster.isWorker) {
 		// Send a 'ready' message to parent process
 		process.send('ready');
@@ -150,13 +150,9 @@ async function queueMain() {
 	bootLogger.succ('Misskey initialized');
 
 	// start processor
-	const queue = require('./queue').default();
+	require('./queue').default();
 
-	if (queue) {
-		bootLogger.succ('Queue started', null, true);
-	} else {
-		bootLogger.error('Queue not available');
-	}
+	bootLogger.succ('Queue started', null, true);
 }
 
 const runningNodejsVersion = process.version.slice(1).split('.').map(x => parseInt(x, 10));