mirror of
https://activitypub.software/TransFem-org/Sharkey
synced 2024-11-22 05:55:12 +00:00
merge: pass redis config as-is to postgres cache (!577)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/577 Approved-by: Tess K <me@thvxl.se> Approved-by: Marie <marie@kaifa.ch>
This commit is contained in:
commit
41e32e792a
2 changed files with 4 additions and 7 deletions
|
@ -12,9 +12,10 @@ import * as Sentry from '@sentry/node';
|
|||
import type { RedisOptions } from 'ioredis';
|
||||
|
||||
type RedisOptionsSource = Partial<RedisOptions> & {
|
||||
host: string;
|
||||
port: number;
|
||||
host?: string;
|
||||
port?: number;
|
||||
family?: number;
|
||||
path?: string,
|
||||
pass: string;
|
||||
db?: number;
|
||||
prefix?: string;
|
||||
|
|
|
@ -236,12 +236,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,
|
||||
|
|
Loading…
Reference in a new issue