Skip to content

Commit

Permalink
Merge pull request #28129 from nextcloud/bugfix/noid/redis-allow-defa…
Browse files Browse the repository at this point in the history
…ults

Allow empty Redis config
  • Loading branch information
skjnldsv authored Jul 23, 2021
2 parents 74e7934 + 41ddbec commit 229bfcb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/private/RedisFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ private function create() {
? $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');
}
Expand Down Expand Up @@ -86,6 +82,10 @@ private function create() {

// 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);
Expand Down

0 comments on commit 229bfcb

Please sign in to comment.