moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 18:36:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-81794-main' of https://github.com/meirzamoodle/moodle

Browse source
This commit is contained in:
Andrew Nicols 2024-06-06 10:44:53 +08:00 • committed by Jun Pataleta
commit 8a92cb82a6
No known key found for this signature in database
GPG key ID: F83510526D99E2C7
3 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cache/stores/redis/lib.php vendored
View file

@ -234,6 +234,15 @@ class cachestore_redis extends cache_store implements cache_is_key_aware, cache_
// We only need the first record for the single redis.
if (!$clustermode) {
// Handle the case when the server is not a Unix domain socket.
if ($port !== 0) {
// We only need the first record for the single redis.
$serverchunks = explode(':', $trimmedservers[0]);
// Get the last chunk as the port.
$port = array_pop($serverchunks);
// Combine the rest of the chunks back into a string as the server.
$server = implode(':', $serverchunks);
}
break;
}
}
@ -259,8 +268,6 @@ class cachestore_redis extends cache_store implements cache_is_key_aware, cache_
if ($clustermode) {
$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($server, $port, 1, null, 100, 1, $opts);
if (!empty($password)) {