From 8aa089178a54559cbc4e4fe84a618fc7535f178c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 18 Mar 2021 10:49:14 +0900
Subject: Improve server performance

---
 src/queue/processors/deliver.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/queue/processors')

diff --git a/src/queue/processors/deliver.ts b/src/queue/processors/deliver.ts
index cb7587ef81..a8b4ed4fe3 100644
--- a/src/queue/processors/deliver.ts
+++ b/src/queue/processors/deliver.ts
@@ -7,11 +7,15 @@ import { instanceChart } from '../../services/chart';
 import { fetchInstanceMetadata } from '../../services/fetch-instance-metadata';
 import { fetchMeta } from '../../misc/fetch-meta';
 import { toPuny } from '../../misc/convert-host';
+import { Cache } from '../../misc/cache';
+import { Instance } from '../../models/entities/instance';
 
 const logger = new Logger('deliver');
 
 let latest: string | null = null;
 
+const suspendedHostsCache = new Cache<Instance[]>(1000 * 60 * 60);
+
 export default async (job: Bull.Job) => {
 	const { host } = new URL(job.data.to);
 
@@ -22,12 +26,15 @@ export default async (job: Bull.Job) => {
 	}
 
 	// isSuspendedなら中断
-	const suspendedHosts = await Instances.find({
-		where: {
-			isSuspended: true
-		},
-		cache: 60 * 1000
-	});
+	let suspendedHosts = suspendedHostsCache.get(null);
+	if (suspendedHosts == null) {
+		suspendedHosts = await Instances.find({
+			where: {
+				isSuspended: true
+			},
+		});
+		suspendedHostsCache.set(null, suspendedHosts);
+	}
 	if (suspendedHosts.map(x => x.host).includes(toPuny(host))) {
 		return 'skip (suspended)';
 	}
-- 
cgit v1.2.3-freya


From 0d19c2d42ee98e36d45d8040f9e9df7e4a9de0b7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 18 Mar 2021 11:03:38 +0900
Subject: add note

---
 src/queue/processors/inbox.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/queue/processors')

diff --git a/src/queue/processors/inbox.ts b/src/queue/processors/inbox.ts
index b4e8b85a46..a5822ff25f 100644
--- a/src/queue/processors/inbox.ts
+++ b/src/queue/processors/inbox.ts
@@ -40,6 +40,7 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
 		return `Old keyId is no longer supported. ${keyIdLower}`;
 	}
 
+	// TDOO: キャッシュ
 	const dbResolver = new DbResolver();
 
 	// HTTP-Signature keyIdを元にDBから取得
-- 
cgit v1.2.3-freya