Merge pull request #28131 from nextcloud/backport/28129/stable22

[stable22] Allow empty Redis config
nextcloud · Jul 23, 2021 · add5919 · add5919
2 parents f19f9e1 + d5b38ed
commit add5919
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php
@@ -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');
 		}
@@ -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);