upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #46683 from nextcloud/backport/46674/stable28

Browse source 
[stable28] feat: add config flag to toggle persistent redis connections
This commit is contained in:
Andy Scherzinger 2024-07-25 19:39:20 +02:00 committed by GitHub
commit 942a91916a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/private/RedisFactory.php
View file

@ -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);
}
}