diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2021-07-23 09:53:06 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2021-07-23 12:30:41 +0000 |
| commit | d5b38ed5f83eba3dcb75dee69ca880695ecc23d1 (patch) | |
| tree | 65c8a569d15c4a02dbdd411ad81f2e9494b492e7 /lib/private | |
| parent | f19f9e1927a76716448d78ce8d8bcfefa959a9cf (diff) | |
| download | nextcloud-server-d5b38ed5f83eba3dcb75dee69ca880695ecc23d1.tar.gz nextcloud-server-d5b38ed5f83eba3dcb75dee69ca880695ecc23d1.zip | |
Allow empty Redis config
When Redis config is empty, use defaults.
However when a Redis cluster config is specified, the "seeds" attribute
is mandatory.
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/RedisFactory.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php index 7609a75d52d..8160f2569e0 100644 --- a/lib/private/RedisFactory.php +++ b/lib/private/RedisFactory.php @@ -51,10 +51,6 @@ class RedisFactory { ? $this->config->getValue('redis.cluster', []) : $this->config->getValue('redis', []); - if (empty($config)) { - throw new \Exception('Redis config is empty'); - } - if ($isCluster && !class_exists('RedisCluster')) { throw new \Exception('Redis Cluster support is not available'); } @@ -86,6 +82,10 @@ class RedisFactory { // cluster config if ($isCluster) { + if (!isset($config['seeds'])) { + throw new \Exception('Redis cluster config is missing the "seeds" attribute'); + } + // Support for older phpredis versions not supporting connectionParameters if ($connectionParameters !== null) { $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, false, $auth, $connectionParameters); |