summaryrefslogtreecommitdiff
path: root/packages/backend/src/server
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-08-06 17:51:51 +0100
committerdakkar <dakkar@thenautilus.net>2024-08-06 17:51:51 +0100
commit94dceb9e15474f85d94b7ea89a5e2197d4f9b6fc (patch)
tree6bb6da6dea6e802a5c5106a90564e11b01a31ddd /packages/backend/src/server
parentappease the linter (diff)
parentmerge: Remove infinite caches to prevent memory leak (!587) (diff)
downloadsharkey-94dceb9e15474f85d94b7ea89a5e2197d4f9b6fc.tar.gz
sharkey-94dceb9e15474f85d94b7ea89a5e2197d4f9b6fc.tar.bz2
sharkey-94dceb9e15474f85d94b7ea89a5e2197d4f9b6fc.zip
Merge branch 'develop' into feature/misskey-2024.07
Diffstat (limited to 'packages/backend/src/server')
-rw-r--r--packages/backend/src/server/NodeinfoServerService.ts2
-rw-r--r--packages/backend/src/server/api/AuthenticateService.ts2
-rw-r--r--packages/backend/src/server/web/UrlPreviewService.ts4
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts
index 716bb0944b..bc8d3c0411 100644
--- a/packages/backend/src/server/NodeinfoServerService.ts
+++ b/packages/backend/src/server/NodeinfoServerService.ts
@@ -135,7 +135,7 @@ export class NodeinfoServerService {
return document;
};
- const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10);
+ const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10); // 10m
fastify.get(nodeinfo2_1path, async (request, reply) => {
const base = await cache.fetch(() => nodeinfo2(21));
diff --git a/packages/backend/src/server/api/AuthenticateService.ts b/packages/backend/src/server/api/AuthenticateService.ts
index ddef8db987..690ff2e022 100644
--- a/packages/backend/src/server/api/AuthenticateService.ts
+++ b/packages/backend/src/server/api/AuthenticateService.ts
@@ -37,7 +37,7 @@ export class AuthenticateService implements OnApplicationShutdown {
private cacheService: CacheService,
) {
- this.appCache = new MemoryKVCache<MiApp>(Infinity);
+ this.appCache = new MemoryKVCache<MiApp>(1000 * 60 * 60 * 24 * 7); // 1w
}
@bindThis
diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 96038d9c1e..ef804b5bfd 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -38,8 +38,8 @@ export class UrlPreviewService {
) {
this.logger = this.loggerService.getLogger('url-preview');
this.previewCache = new RedisKVCache<SummalyResult>(this.redisClient, 'summaly', {
- lifetime: 1000 * 86400,
- memoryCacheLifetime: 1000 * 10 * 60,
+ lifetime: 1000 * 60 * 60 * 24, // 1d
+ memoryCacheLifetime: 1000 * 60 * 10, // 10m
fetcher: (key: string) => { throw new Error('the UrlPreview cache should never fetch'); },
toRedisConverter: (value) => JSON.stringify(value),
fromRedisConverter: (value) => JSON.parse(value),