mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15685 from nextcloud/fix/noid/redis-cluster-with-auth 

Allow redis cluster to use password
This commit is contained in:
Morris Jobke 2019-05-22 13:47:11 +02:00 committed by GitHub
parent f2885c171f e9e9b6a4b6
commit 024fc27e9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config.sample.php
View File

@ -1160,15 +1160,19 @@ $CONFIG = array(
* which then causes a FileLocked exception. * which then causes a FileLocked exception.
* *
* See https://redis.io/topics/cluster-spec for details about the Redis cluster * See https://redis.io/topics/cluster-spec for details about the Redis cluster
*
* Authentication works with phpredis version 4.2.1+. See
* https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
*/ */
'redis.cluster' => [ 'redis.cluster' => [
'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required 'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
'localhost:7000', 'localhost:7000',
'localhost:7001' 'localhost:7001',
], ],
'timeout' => 0.0, 'timeout' => 0.0,
'read_timeout' => 0.0, 'read_timeout' => 0.0,
'failover_mode' => \RedisCluster::FAILOVER_ERROR 'failover_mode' => \RedisCluster::FAILOVER_ERROR,
'password' => '', // Optional, if not defined no password will be used.
], ],

6
lib/private/RedisFactory.php
View File

@ -56,7 +56,11 @@ class RedisFactory {
} else { } else {
$readTimeout = null; $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'])) { if (isset($config['failover_mode'])) {
$this->instance->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, $config['failover_mode']); $this->instance->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, $config['failover_mode']);