diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-05-22 13:47:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-22 13:47:11 +0200 |
| commit | 024fc27e9a975f113ee64e6541c91eff59d0444d (patch) | |
| tree | fdc82a029882928821dbe6e48e3c719b099519cf /lib | |
| parent | f2885c171f5fc3b3dc54b612454616f5a929132a (diff) | |
| parent | e9e9b6a4b63aa32e9623337ed3ea2838414cb5b1 (diff) | |
| download | nextcloud-server-024fc27e9a975f113ee64e6541c91eff59d0444d.tar.gz nextcloud-server-024fc27e9a975f113ee64e6541c91eff59d0444d.zip | |
Merge pull request #15685 from nextcloud/fix/noid/redis-cluster-with-auth
Allow redis cluster to use password
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/RedisFactory.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php index 22d02e07c29..2224eaca79c 100644 --- a/lib/private/RedisFactory.php +++ b/lib/private/RedisFactory.php @@ -56,7 +56,11 @@ class RedisFactory { } else { $readTimeout = null; } - $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout); + if (isset($config['password']) && $config['password'] !== '') { + $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, false, $config['password']); + } else { + $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout); + } if (isset($config['failover_mode'])) { $this->instance->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, $config['failover_mode']); |