From eec4a9ab727217e1b68fe2fd37eab6391957ec87 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Sat, 22 Feb 2025 13:37:00 +0100 Subject: [PATCH] Introduce a REDIS_URL --- app/AppKernel.php | 26 ++++++++++++++++++++++++++ app/config/services.yml | 7 +------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/AppKernel.php b/app/AppKernel.php index 0e9d62e4b..b6eefb095 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -77,6 +77,7 @@ class AppKernel extends Kernel $loader->load(function (ContainerBuilder $container) { $this->processDatabaseParameters($container); + $this->defineRedisUrlEnvVar($container); }); } @@ -112,4 +113,29 @@ class AppKernel extends Kernel $container->setParameter('database_port', (string) $container->getParameter('database_port')); $container->setParameter('database_socket', (string) $container->getParameter('database_socket')); } + + private function defineRedisUrlEnvVar(ContainerBuilder $container) + { + $scheme = $container->getParameter('redis_scheme'); + $host = $container->getParameter('redis_host'); + $port = $container->getParameter('redis_port'); + $path = $container->getParameter('redis_path'); + $password = $container->getParameter('redis_password'); + + $url = $scheme . '://'; + + if ($password) { + $url .= $password . '@'; + } + + $url .= $host; + + if ($port) { + $url .= ':' . $port; + } + + $url .= '/' . ltrim($path, '/'); + + $container->setParameter('env(REDIS_URL)', $url); + } } diff --git a/app/config/services.yml b/app/config/services.yml index 09eb22729..ea80f98e0 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -248,12 +248,7 @@ services: Predis\Client: arguments: - $parameters: - scheme: '%redis_scheme%' - host: '%redis_host%' - port: '%redis_port%' - path: '%redis_path%' - password: '%redis_password%' + $parameters: '%env(REDIS_URL)%' Wallabag\Event\Subscriber\SQLiteCascadeDeleteSubscriber: tags: