diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-07-22 14:25:20 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-07-22 13:08:39 +0000 |
| commit | 7c33e5c00ff3e9d1cb511ad2ae5d8150af7154ba (patch) | |
| tree | 15f911e9bd69ff7fd3bf35753744bcf83976407f /lib/private/RedisFactory.php | |
| parent | 03a08e3863dde0ac5231bbb7bbe3f3dcadbae918 (diff) | |
| download | nextcloud-server-7c33e5c00ff3e9d1cb511ad2ae5d8150af7154ba.tar.gz nextcloud-server-7c33e5c00ff3e9d1cb511ad2ae5d8150af7154ba.zip | |
feat: add config flag to toggle persistent redis connections
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/RedisFactory.php')
| -rw-r--r-- | lib/private/RedisFactory.php | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php index b657a0a83af..32be326d46f 100644 --- a/lib/private/RedisFactory.php +++ b/lib/private/RedisFactory.php @@ -74,6 +74,7 @@ class RedisFactory { // # TLS support // # https://github.com/phpredis/phpredis/issues/1600 $connectionParameters = $this->getSslContext($config); + $persistent = $this->config->getValue('redis.persistent', true); // cluster config if ($isCluster) { @@ -83,9 +84,9 @@ class RedisFactory { // 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'])) { @@ -104,17 +105,25 @@ class RedisFactory { $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); + } } |