From d018536312d7b0da589b69ed992eda067541d643 Mon Sep 17 00:00:00 2001 From: Benjamin Walker Date: Mon, 2 Jun 2025 12:00:51 +1000 Subject: [PATCH] MDL-85336 redis: Support floats in connection timeout --- config-dist.php | 2 +- public/lib/classes/session/redis.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config-dist.php b/config-dist.php index 4bf70da9b32..4acd504a306 100644 --- a/config-dist.php +++ b/config-dist.php @@ -380,7 +380,7 @@ $CFG->admin = 'admin'; // $CFG->session_redis_lock_expire = 7200; // Optional, defaults to session timeout. // $CFG->session_redis_lock_retry = 100; // Optional wait between lock attempts in ms, default is 100. // // After 5 seconds it will throttle down to once per second. -// $CFG->session_redis_connection_timeout = 3; // Optional, default is 3. +// $CFG->session_redis_connection_timeout = 3.0; // Optional, default is 3.0. // $CFG->session_redis_maxretries = 3; // Optional, default is 3. // // Use the igbinary serializer instead of the php default one. Note that phpredis must be compiled with diff --git a/public/lib/classes/session/redis.php b/public/lib/classes/session/redis.php index 81ab0e15b08..0713c352b28 100644 --- a/public/lib/classes/session/redis.php +++ b/public/lib/classes/session/redis.php @@ -114,8 +114,8 @@ class redis extends handler implements SessionHandlerInterface { /** @var clock A clock instance */ protected clock $clock; - /** @var int $connectiontimeout The number of seconds to wait for a connection or response from the Redis server. */ - protected int $connectiontimeout = 3; + /** @var float $connectiontimeout The number of seconds to wait for a connection or response from the Redis server. */ + protected float $connectiontimeout = 3.0; /** * Create new instance of handler. @@ -205,7 +205,7 @@ class redis extends handler implements SessionHandlerInterface { } if (isset($CFG->session_redis_connection_timeout)) { - $this->connectiontimeout = (int)$CFG->session_redis_connection_timeout; + $this->connectiontimeout = (float)$CFG->session_redis_connection_timeout; } if (isset($CFG->session_redis_max_retries)) {