diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-08-06 10:35:14 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-08-06 10:35:14 +0100 |
| commit | 34c1e9ea2b6389e4bcc86864bcfc34f449e4f677 (patch) | |
| tree | 3f67f257580a84e305ad5c1eb02e36ae5e2f0dc6 /packages/backend/src/postgres.ts | |
| parent | revert AiScript hack for plugins (diff) | |
| parent | merge: don't send real-time updates of replies to blocked users #457 #573 (!566) (diff) | |
| download | sharkey-34c1e9ea2b6389e4bcc86864bcfc34f449e4f677.tar.gz sharkey-34c1e9ea2b6389e4bcc86864bcfc34f449e4f677.tar.bz2 sharkey-34c1e9ea2b6389e4bcc86864bcfc34f449e4f677.zip | |
Merge branch 'develop' into feature/misskey-2024.07
fixing conflicts in `package.json`
Diffstat (limited to 'packages/backend/src/postgres.ts')
| -rw-r--r-- | packages/backend/src/postgres.ts | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts index e6da273423..047b7f8ae9 100644 --- a/packages/backend/src/postgres.ts +++ b/packages/backend/src/postgres.ts @@ -240,12 +240,8 @@ export function createPostgresDataSource(config: Config) { cache: !config.db.disableCache && process.env.NODE_ENV !== 'test' ? { // dbをcloseしても何故かredisのコネクションが内部的に残り続けるようで、テストの際に支障が出るため無効にする(キャッシュも含めてテストしたいため本当は有効にしたいが...) type: 'ioredis', options: { - host: config.redis.host, - port: config.redis.port, - family: config.redis.family ?? 0, - password: config.redis.pass, + ...config.redis, keyPrefix: `${config.redis.prefix}:query:`, - db: config.redis.db ?? 0, }, } : false, logging: log, |