diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index add5d59d9b..568285f623 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -46,7 +46,6 @@ type Source = { pass: string; }[]; redis: RedisOptionsSource; - redisForDatabaseCache?: RedisOptionsSource; redisForPubsub?: RedisOptionsSource; redisForJobQueue?: RedisOptionsSource; redisForSystemQueue?: RedisOptionsSource; @@ -177,7 +176,6 @@ export type Config = { externalMediaProxyEnabled: boolean; videoThumbnailGenerator: string | null; redis: RedisOptions & RedisOptionsSource; - redisForDatabaseCache: RedisOptions & RedisOptionsSource; redisForPubsub: RedisOptions & RedisOptionsSource; redisForSystemQueue: RedisOptions & RedisOptionsSource; redisForEndedPollNotificationQueue: RedisOptions & RedisOptionsSource; @@ -253,7 +251,6 @@ export function loadConfig(): Config { dbSlaves: config.dbSlaves, meilisearch: config.meilisearch, redis, - redisForDatabaseCache: config.redisForDatabaseCache ? convertRedisOptions(config.redisForDatabaseCache, host) : redis, redisForPubsub: config.redisForPubsub ? convertRedisOptions(config.redisForPubsub, host) : redis, redisForSystemQueue: config.redisForSystemQueue ? convertRedisOptions(config.redisForSystemQueue, host) : redisForJobQueue, redisForEndedPollNotificationQueue: config.redisForEndedPollNotificationQueue ? convertRedisOptions(config.redisForEndedPollNotificationQueue, host) : redisForJobQueue, diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts index 0552a2d878..3d665d3e44 100644 --- a/packages/backend/src/postgres.ts +++ b/packages/backend/src/postgres.ts @@ -236,13 +236,7 @@ export function createPostgresDataSource(config: Config) { } : {}), synchronize: process.env.NODE_ENV === 'test', dropSchema: process.env.NODE_ENV === 'test', - cache: !config.db.disableCache && process.env.NODE_ENV !== 'test' ? { // dbをcloseしても何故かredisのコネクションが内部的に残り続けるようで、テストの際に支障が出るため無効にする(キャッシュも含めてテストしたいため本当は有効にしたいが...) - type: 'ioredis', - options: { - ...config.redisForDatabaseCache, - keyPrefix: `${config.redisForDatabaseCache.prefix}:query:`, - }, - } : false, + cache: !config.db.disableCache && process.env.NODE_ENV !== 'test', logging: log, logger: log ? new MyCustomLogger() : undefined, maxQueryExecutionTime: 10000, // 10s