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

bug #39434 [Cache] Bugfix provide the correct host and port when throwing the exception (renan)

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

Discussion
----------

[Cache] Bugfix provide the correct host and port when throwing the exception

| Q             | A
| ------------- | ---
| Branch?       | 5.x
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | none
| License       | MIT
| Doc PR        | none

The message before was including the result of the `getMasterAddrByName` call of which ended with:
```
Failed to retrieve master information from master name "mymaster" and address ":0".
```

Commits
-------

276bbb5e85 [Cache] Bugfix provide the correct host and port when throwing the exception
This commit is contained in:
Nicolas Grekas 2020-12-10 18:35:09 +01:00
commit f66b853f4a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Component/Cache/Tests/Adapter/RedisAdapterSentinelTest.php
View File

@ -41,4 +41,13 @@ class RedisAdapterSentinelTest extends AbstractRedisAdapterTest
$dsn = 'redis:?host[redis1]&host[redis2]&host[redis3]&redis_cluster=1&redis_sentinel=mymaster';
RedisAdapter::createConnection($dsn);
}
public function testExceptionMessageWhenFailingToRetrieveMasterInformation()
{
$hosts = getenv('REDIS_SENTINEL_HOSTS');
$firstHost = explode(' ', $hosts)[0];
$this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
$this->expectExceptionMessage('Failed to retrieve master information from master name "invalid-masterset-name" and address "'.$firstHost.'".');
AbstractAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['redis_sentinel' => 'invalid-masterset-name']);
}
}

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

@ -186,9 +186,11 @@ trait RedisTrait
if (isset($params['redis_sentinel'])) {
$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 (!$address = $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));
}
[$host, $port] = $address;
}
try {