diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #39431 [Cache] Make use of read_timeout in \RedisSentinel and \Redis (ferrastas)

Browse Source 
This PR was merged into the 5.3-dev branch.

Discussion
----------

[Cache] Make use of `read_timeout` in `\RedisSentinel` and `\Redis`

| Q             | A
| ------------- | ---
| Branch?       | 5.x
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | Fix #39429
| License       | MIT

This is a bugfix for #39363 a feature introduced in 5.x

As described in issue #39429, `\RedisSentinel` accepts an optional read timeout value during construction.
`read_timeout` is already part of the connection options, this PR just make use of it.

Commits
-------

14e36a22d6 [Cache] Make use of `read_timeout` in `\RedisSentinel` and `\Redis`
This commit is contained in:
Nicolas Grekas 2020-12-10 17:41:45 +01:00
commit 7c98ee1597
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Cache/Traits/RedisTrait.php
View File

@ -184,7 +184,7 @@ trait RedisTrait
$port = $hosts[0]['port'] ?? null; $port = $hosts[0]['port'] ?? null;
if (isset($params['redis_sentinel'])) { if (isset($params['redis_sentinel'])) {
$sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']); $sentinel = new \RedisSentinel($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);
if (![$host, $port] = $sentinel->getMasterAddrByName($params['redis_sentinel'])) { if (![$host, $port] = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
throw new InvalidArgumentException(sprintf('Failed to retrieve master information from master name "%s" and address "%s:%d".', $params['redis_sentinel'], $host, $port)); throw new InvalidArgumentException(sprintf('Failed to retrieve master information from master name "%s" and address "%s:%d".', $params['redis_sentinel'], $host, $port));
@ -192,7 +192,7 @@ trait RedisTrait
} }
try { try {
@$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval']); @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout']);
set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; }); set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
$isConnected = $redis->isConnected(); $isConnected = $redis->isConnected();