silence warnings issued by Redis Sentinel on connection issues

xabbuh · xabbuh · commit 99b6fcae12ef · 2024-09-23T15:56:29.000+02:00
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -246,10 +246,10 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
                         } else {
                             $extra = $passAuth ? [$params['auth']] : [];
 
-                            $sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
+                            $sentinel = @new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);
                         }
 
-                        if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {
+                        if ($address = @$sentinel->getMasterAddrByName($params['redis_sentinel'])) {
                             [$host, $port] = $address;
                         }
                     } catch (\RedisException|\Relay\Exception $redisException) {
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -136,10 +136,10 @@ public function __construct(array $options, \Redis|Relay|\RedisCluster|null $red
 
                                 $sentinel = new \RedisSentinel($params);
                             } else {
-                                $sentinel = new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);
+                                $sentinel = @new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);
                             }
 
-                            if ($address = $sentinel->getMasterAddrByName($sentinelMaster)) {
+                            if ($address = @$sentinel->getMasterAddrByName($sentinelMaster)) {
                                 [$host, $port] = $address;
                             }
                         } catch (\RedisException|\Relay\Exception $redisException) {

Original file line number	Diff line number	Diff line change
`@@ -246,10 +246,10 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra`
`246`	`246`	`} else {`
`247`	`247`	`$extra = $passAuth ? [$params['auth']] : [];`
`248`	`248`
`249`		`- $sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);`
	`249`	`+ $sentinel = @new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra);`
`250`	`250`	`}`
`251`	`251`
`252`		`- if ($address = $sentinel->getMasterAddrByName($params['redis_sentinel'])) {`
	`252`	`+ if ($address = @$sentinel->getMasterAddrByName($params['redis_sentinel'])) {`
`253`	`253`	`[$host, $port] = $address;`
`254`	`254`	`}`
`255`	`255`	`} catch (\RedisException\|\Relay\Exception $redisException) {`
Original file line number	Diff line number	Diff line change
`@@ -136,10 +136,10 @@ public function __construct(array $options, \Redis\|Relay\|\RedisCluster\|null $red`
`136`	`136`
`137`	`137`	`$sentinel = new \RedisSentinel($params);`
`138`	`138`	`} else {`
`139`		`- $sentinel = new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);`
	`139`	`+ $sentinel = @new $sentinelClass($host, $port, $options['timeout'], $options['persistent_id'], $options['retry_interval'], $options['read_timeout']);`
`140`	`140`	`}`
`141`	`141`
`142`		`- if ($address = $sentinel->getMasterAddrByName($sentinelMaster)) {`
	`142`	`+ if ($address = @$sentinel->getMasterAddrByName($sentinelMaster)) {`
`143`	`143`	`[$host, $port] = $address;`
`144`	`144`	`}`
`145`	`145`	`} catch (\RedisException\|\Relay\Exception $redisException) {`