L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-81366 redis: Remove the named parameters

Browse Source 
Unfortunately, the read_timeout named parameter was not recognized on some machines.
To avoid such errors, this patch removed the named parameter on a single Redis connect() and the Redis cluster.
This commit is contained in:
meirzamoodle
2024-03-28 10:19:35 +07:00
parent c895def59b
commit ce5b7edd5c
2 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cache/stores/redis/lib.php
Vendored
+3 -22
View File
@@ -215,8 +215,6 @@ class cachestore_redis extends cache_store implements cache_is_key_aware, cache_
// Set Redis server(s).
$servers = explode("\n", $configuration['server']);
$trimmedservers = [];
// print_r($configuration);
// print_r($servers);
foreach ($servers as $server) {
$server = strtolower(trim($server));
if (!empty($server)) {
@@ -256,32 +254,15 @@ class cachestore_redis extends cache_store implements cache_is_key_aware, cache_
}
// Connect to redis.
$redis = null;
// print_r($trimmedservers);
// exit;
try {
// Create a $redis object of a RedisCluster or Redis class.
if ($clustermode) {
$redis = new RedisCluster(
name: null,
seeds: $trimmedservers,
timeout: 1,
read_timeout: 1,
persistent: true,
auth: $password,
context: !empty($opts) ? $opts : null,
);
$redis = new RedisCluster(null, $trimmedservers, 1, 1, true, $password, !empty($opts) ? $opts : null);
} else {
// We only need the first record for the single redis.
list($server, $port) = explode(':', $trimmedservers[0]);
$redis = new Redis();
$redis->connect(
host: $server,
port: $port,
timeout: 1,
retry_interval: 100,
read_timeout: 1,
context: $opts,
);
$redis->connect($server, $port, 1, null, 100, 1, $opts);
if (!empty($password)) {
$redis->auth($password);
}
@@ -306,7 +287,7 @@ class cachestore_redis extends cache_store implements cache_is_key_aware, cache_
}
$this->isready = true;
} catch (RedisException | RedisClusterException $e) {
$server = $clustermode ? implode(',', $trimmedservers) : $trimmedservers[0].':'.$port;
$server = $clustermode ? implode(',', $trimmedservers) : $server.':'.$port;
debugging("Failed to connect to Redis at {$server}, the error returned was: {$e->getMessage()}");
$this->isready = false;
}
lib/classes/session/redis.php
+3 -17
View File
@@ -257,27 +257,13 @@ class redis extends handler implements SessionHandlerInterface {
try {
// Create a $redis object of a RedisCluster or Redis class.
if ($this->clustermode) {
$this->connection = new \RedisCluster(
name: null,
seeds: $trimmedservers,
timeout: 1,
read_timeout: 1,
persistent: true,
auth: $this->auth,
context: !empty($opts) ? $opts : null,
);
$this->connection = new \RedisCluster(null, $trimmedservers, 1, 1, true,
$this->auth, !empty($opts) ? $opts : null);
} else {
$delay = rand(100, 500);
list($server, $port) = explode(':', $trimmedservers[0]);
$this->connection = new \Redis();
$this->connection->connect(
host: $server,
port: $this->port ?? $port,
timeout: 1,
retry_interval: $delay,
read_timeout: 1,
context: $opts,
);
$this->connection->connect($server, $this->port ?? $port, 1, null, $delay, 1, $opts);
if ($this->auth !== '' && !$this->connection->auth($this->auth)) {
throw new $exceptionclass('Unable to authenticate.');
}