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

moodle · Apr 2, 2024 · 07680ea · 07680ea
2 parents a6047e0 + ce5b7ed
commit 07680ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 39 deletions.
diff --git a/cache/stores/redis/lib.php b/cache/stores/redis/lib.php
@@ -215,8 +215,6 @@ protected function new_redis(array $configuration): Redis|RedisCluster|null {
         // 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 @@ protected function new_redis(array $configuration): Redis|RedisCluster|null {
         }
         // 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 @@ protected function new_redis(array $configuration): Redis|RedisCluster|null {
             }
             $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;
         }

diff --git a/lib/classes/session/redis.php b/lib/classes/session/redis.php
@@ -257,27 +257,13 @@ public function init() {
             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.');
                     }