From 35d06401675b22daeb628cfef0660952d1b4b8df Mon Sep 17 00:00:00 2001 From: Nick Santamaria Date: Tue, 24 Sep 2024 13:31:34 +1000 Subject: [PATCH] Fixed REDIS_INTERFACE config overrides --- images/php/settings.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/images/php/settings.php b/images/php/settings.php index 3fd585ac..305716b8 100755 --- a/images/php/settings.php +++ b/images/php/settings.php @@ -106,19 +106,7 @@ $redis_port = getenv('REDIS_SERVICE_PORT') ?: '6379'; $redis_timeout = getenv('REDIS_TIMEOUT') ?: 1; $redis_password = getenv('REDIS_PASSWORD') ?: ''; - - $redis_interface = 'PhpRedis'; - - if (class_exists('\Drupal\redis\Cache\PhpRedisCluster')) { - // Assume that if the cluster class exists we need to use it. - $redis_interface = 'PhpRedisCluster'; - } - - if (getenv('REDIS_INTERFACE')) { - // Allow environment variable override for the interface (eg. forcing - // connection via a standalone pod). - $redis_interface = getenv('REDIS_INTERFACE'); - } + $redis_interface = getenv('REDIS_INTERFACE') ?: 'PhpRedis'; $settings['redis.connection']['host'] = $redis_host; $settings['redis.connection']['port'] = $redis_port;