bug #39433 [Cache] fix setting "read_timeout" when using Redis (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 9186d149dfc3 · 2020-12-10T18:39:37.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Cache] fix setting "read_timeout" when using Redis | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Being inspired by #39431 Commits ------- 7acca31 [Cache] fix setting "read_timeout" when using Redis
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -176,7 +176,7 @@ public static function createConnection($dsn, array $options = [])
 
             $initializer = static function ($redis) use ($connect, $params, $dsn, $auth, $hosts) {
                 try {
-                    @$redis->{$connect}($hosts[0]['host'] ?? $hosts[0]['path'], $hosts[0]['port'] ?? null, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']);
+                    @$redis->{$connect}($hosts[0]['host'] ?? $hosts[0]['path'], $hosts[0]['port'] ?? null, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);
 
                     set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
                     $isConnected = $redis->isConnected();
@@ -188,7 +188,6 @@ public static function createConnection($dsn, array $options = [])
 
                     if ((null !== $auth && !$redis->auth($auth))
                         || ($params['dbindex'] && !$redis->select($params['dbindex']))
-                        || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
                     ) {
                         $e = preg_replace('/^ERR /', '', $redis->getLastError());
                         throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e.'.');
@@ -215,6 +214,7 @@ public static function createConnection($dsn, array $options = [])
             }
             $params['lazy_connect'] = $params['lazy'] ?? true;
             $params['connect_timeout'] = $params['timeout'];
+            $params['read_timeout'] = $params['read_timeout'];
 
             try {
                 $redis = new $class($hosts, $params);
