about summary refs log tree commit diff
path: root/streaming
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-06-24 22:25:23 +0200
committerGitHub <noreply@github.com>2020-06-24 22:25:23 +0200
commitddcdddd6fcb955ac74d7ed525587ff4c4f2af118 (patch)
tree384c26575f5e40723758314c565b124f3b64e121 /streaming
parentbb9ca8a587ee5a3ec8778e72828aca0ba8871327 (diff)
Change streaming server to treat blank redis password as password-less auth (#14135)
Fixes #14131

Our `mastodon:setup` task defaults to a blank password rather than the
absence of password, but some versions of Redis reject blank password
authentication when authentication is possible without a password.

The Ruby code only uses the Redis password when it's not blank, so
do the same for the node.js part.
Diffstat (limited to 'streaming')
-rw-r--r--streaming/index.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/index.js b/streaming/index.js
index d7b1df81f..39e70c1ba 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -118,7 +118,7 @@ const startWorker = (workerId) => {
     host:     process.env.REDIS_HOST     || '127.0.0.1',
     port:     process.env.REDIS_PORT     || 6379,
     db:       process.env.REDIS_DB       || 0,
-    password: process.env.REDIS_PASSWORD,
+    password: process.env.REDIS_PASSWORD || undefined,
   };
 
   if (redisNamespace) {