Merge pull request #46682 from nextcloud/backport/46674/stable27

nextcloud · Jul 28, 2024 · 9265063 · 9265063
2 parents f0d2fc8 + 52fff58
commit 9265063
Showing 1 changed file with 21 additions and 12 deletions.
diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php
@@ -83,6 +83,7 @@ private function create() {
 		// # TLS support
 		// # https://github.com/phpredis/phpredis/issues/1600
 		$connectionParameters = $this->getSslContext($config);
+		$persistent = $this->config->getValue('redis.persistent', true);
 
 		// cluster config
 		if ($isCluster) {
@@ -92,9 +93,9 @@ private function create() {
 
 			// Support for older phpredis versions not supporting connectionParameters
 			if ($connectionParameters !== null) {
-				$this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, true, $auth, $connectionParameters);
+				$this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, $persistent, $auth, $connectionParameters);
 			} else {
-				$this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, true, $auth);
+				$this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, $persistent, $auth);
 			}
 
 			if (isset($config['failover_mode'])) {
@@ -124,17 +125,25 @@ private function create() {
 				$connectionParameters = [
 					'stream' => $this->getSslContext($config)
 				];
-				/**
-				 * even though the stubs and documentation don't want you to know this,
-				 * pconnect does have the same $connectionParameters argument connect has
-				 *
-				 * https://github.com/phpredis/phpredis/blob/0264de1824b03fb2d0ad515b4d4ec019cd2dae70/redis.c#L710-L730
-				 *
-				 * @psalm-suppress TooManyArguments
-				 */
-				$this->instance->pconnect($host, $port, $timeout, null, 0, $readTimeout, $connectionParameters);
+				if ($persistent) {
+					/**
+					 * even though the stubs and documentation don't want you to know this,
+					 * pconnect does have the same $connectionParameters argument connect has
+					 *
+					 * https://github.com/phpredis/phpredis/blob/0264de1824b03fb2d0ad515b4d4ec019cd2dae70/redis.c#L710-L730
+					 *
+					 * @psalm-suppress TooManyArguments
+					 */
+					$this->instance->pconnect($host, $port, $timeout, null, 0, $readTimeout, $connectionParameters);
+				} else {
+					$this->instance->connect($host, $port, $timeout, null, 0, $readTimeout, $connectionParameters);
+				}
 			} else {
-				$this->instance->pconnect($host, $port, $timeout, null, 0, $readTimeout);
+				if ($persistent) {
+					$this->instance->pconnect($host, $port, $timeout, null, 0, $readTimeout);
+				} else {
+					$this->instance->connect($host, $port, $timeout, null, 0, $readTimeout);
+				}
 			}