summaryrefslogtreecommitdiff
path: root/src/db
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-06-10 11:44:01 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-06-10 11:44:01 +0900
commit95b1e1a21d82567cb4e7802fa23e87692b33c1fa (patch)
tree23e993b7bcf140bb7a61b75af70636c7a2ddb390 /src/db
parentMerge branch 'develop' (diff)
parent11.20.2 (diff)
downloadmisskey-95b1e1a21d82567cb4e7802fa23e87692b33c1fa.tar.gz
misskey-95b1e1a21d82567cb4e7802fa23e87692b33c1fa.tar.bz2
misskey-95b1e1a21d82567cb4e7802fa23e87692b33c1fa.zip
Merge branch 'develop'
Diffstat (limited to 'src/db')
-rw-r--r--src/db/postgre.ts2
-rw-r--r--src/db/redis.ts2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/db/postgre.ts b/src/db/postgre.ts
index 8e2d585e99..f0f1e7eec0 100644
--- a/src/db/postgre.ts
+++ b/src/db/postgre.ts
@@ -102,7 +102,7 @@ export function initDb(justBorrow = false, sync = false, log = false) {
host: config.redis.host,
port: config.redis.port,
options:{
- auth_pass: config.redis.pass,
+ password: config.redis.pass,
prefix: config.redis.prefix,
db: config.redis.db || 0
}
diff --git a/src/db/redis.ts b/src/db/redis.ts
index 6518cb0059..41d030149c 100644
--- a/src/db/redis.ts
+++ b/src/db/redis.ts
@@ -5,7 +5,7 @@ export default redis.createClient(
config.redis.port,
config.redis.host,
{
- auth_pass: config.redis.pass,
+ password: config.redis.pass,
prefix: config.redis.prefix,
db: config.redis.db || 0
}