summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSatsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>2019-06-11 20:49:08 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-06-11 20:49:08 +0900
commit1432a7193d338b7945f2a285614f5068397d3fe9 (patch)
tree2ef0c911416e7a92c8f57a7c6e4e37fd645e875b /src
parentUpdate README.md [AUTOGEN] (#5044) (diff)
downloadsharkey-1432a7193d338b7945f2a285614f5068397d3fe9.tar.gz
sharkey-1432a7193d338b7945f2a285614f5068397d3fe9.tar.bz2
sharkey-1432a7193d338b7945f2a285614f5068397d3fe9.zip
設定でPostgreSQLのクエリー結果のキャッシュを無効できるように (#5046)
Diffstat (limited to 'src')
-rw-r--r--src/config/types.ts1
-rw-r--r--src/db/postgre.ts4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/config/types.ts b/src/config/types.ts
index c35bc63573..be3575d282 100644
--- a/src/config/types.ts
+++ b/src/config/types.ts
@@ -14,6 +14,7 @@ export type Source = {
db: string;
user: string;
pass: string;
+ disableCache?: boolean;
extra?: { [x: string]: string };
};
redis: {
diff --git a/src/db/postgre.ts b/src/db/postgre.ts
index f0f1e7eec0..c91cd8e1d7 100644
--- a/src/db/postgre.ts
+++ b/src/db/postgre.ts
@@ -96,7 +96,7 @@ export function initDb(justBorrow = false, sync = false, log = false) {
extra: config.db.extra,
synchronize: process.env.NODE_ENV === 'test' || sync,
dropSchema: process.env.NODE_ENV === 'test' && !justBorrow,
- cache: {
+ cache: !config.db.disableCache ? {
type: 'redis',
options: {
host: config.redis.host,
@@ -107,7 +107,7 @@ export function initDb(justBorrow = false, sync = false, log = false) {
db: config.redis.db || 0
}
}
- },
+ } : false,
logging: log,
logger: log ? new MyCustomLogger() : undefined,
entities: [