From 2d23a1b1a73b824f834422582fd40baa73b4afb3 Mon Sep 17 00:00:00 2001 From: Markus Fasselt Date: Thu, 28 Sep 2023 16:40:42 +0200 Subject: [PATCH] [Cache] Fix two initializations of Redis Sentinel --- .../Component/Cache/Traits/RedisTrait.php | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index a471a799acdd0..7cc6c74bed405 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php @@ -223,29 +223,28 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra break; } - if (version_compare(phpversion('redis'), '6.0.0', '>=') && $isRedisExt) { - $options = [ - 'host' => $host, - 'port' => $port, - 'connectTimeout' => $params['timeout'], - 'persistent' => $params['persistent_id'], - 'retryInterval' => $params['retry_interval'], - 'readTimeout' => $params['read_timeout'], - ]; - - if ($passAuth) { - $options['auth'] = $params['auth']; + try { + if (version_compare(phpversion('redis'), '6.0.0', '>=') && $isRedisExt) { + $options = [ + 'host' => $host, + 'port' => $port, + 'connectTimeout' => $params['timeout'], + 'persistent' => $params['persistent_id'], + 'retryInterval' => $params['retry_interval'], + 'readTimeout' => $params['read_timeout'], + ]; + + if ($passAuth) { + $options['auth'] = $params['auth']; + } + + $sentinel = new \RedisSentinel($options); + } 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 \RedisSentinel($options); - } else { - $extra = $passAuth ? [$params['auth']] : []; - - $sentinel = new $sentinelClass($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...$extra); - } - - try { - $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'])) { [$host, $port] = $address; } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy