Merge branch 'develop'

3 files changed, 4 insertions, 2 deletions

diff --git a/src/daemons/janitor.ts b/src/daemons/janitor.ts
index 462ebf915c..c079086427 100644
--- a/src/daemons/janitor.ts
+++ b/src/daemons/janitor.ts
@@ -1,3 +1,5 @@
+// TODO: 消したい
+
 const interval = 30 * 60 * 1000;
 import { AttestationChallenges } from '../models';
 import { LessThan } from 'typeorm';
diff --git a/src/daemons/queue-stats.ts b/src/daemons/queue-stats.ts
index 288e855ae9..77f09b18d6 100644
--- a/src/daemons/queue-stats.ts
+++ b/src/daemons/queue-stats.ts
@@ -1,5 +1,5 @@
 import Xev from 'xev';
-import { deliverQueue, inboxQueue } from '../queue';
+import { deliverQueue, inboxQueue } from '../queue/queues';
 
 const ev = new Xev();
 
diff --git a/src/daemons/server-stats.ts b/src/daemons/server-stats.ts
index bc1da5eef6..8dfa946250 100644
--- a/src/daemons/server-stats.ts
+++ b/src/daemons/server-stats.ts
@@ -75,5 +75,5 @@ async function net() {
 // FS STAT
 async function fs() {
 	const data = await si.disksIO().catch(() => ({ rIO_sec: 0, wIO_sec: 0 }));
-	return data;
+	return data || { rIO_sec: 0, wIO_sec: 0 };
 }