From 95cf0d86bc8c59ed832ded501a52b187ee6a1947 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Fri, 8 Oct 2021 18:52:17 +0200 Subject: [PATCH 1/2] Added support to provide redis sentinel when using redis cache --- composer.json | 4 ++-- config/autoload/redis.global.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2e920760..b00900e7 100644 --- a/composer.json +++ b/composer.json @@ -46,11 +46,11 @@ "predis/predis": "^1.1", "pugx/shortid-php": "^0.7", "ramsey/uuid": "^3.9", - "shlinkio/shlink-common": "dev-main#3eacc46 as 4.0", + "shlinkio/shlink-common": "^4.0", "shlinkio/shlink-config": "^1.2", "shlinkio/shlink-event-dispatcher": "^2.1", "shlinkio/shlink-importer": "^2.3.1", - "shlinkio/shlink-installer": "dev-develop#07f1ac8 as 6.2", + "shlinkio/shlink-installer": "dev-develop#2f87995 as 6.2", "shlinkio/shlink-ip-geolocation": "^2.0", "symfony/console": "^5.3", "symfony/filesystem": "^5.3", diff --git a/config/autoload/redis.global.php b/config/autoload/redis.global.php index a47d814c..22101b65 100644 --- a/config/autoload/redis.global.php +++ b/config/autoload/redis.global.php @@ -13,6 +13,7 @@ return (static function (): array { 'cache' => [ 'redis' => [ 'servers' => $redisServers, + 'sentinel_service' => env('REDIS_SENTINEL_SERVICE'), ], ], ], From 3ffe5304619f85ba99d59066326393d08879ef0a Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Fri, 8 Oct 2021 18:52:53 +0200 Subject: [PATCH 2/2] Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e1542ef..eef5ab39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this When they are used in the query, the values are URL encoded. +* [#1119](https://github.com/shlinkio/shlink/issues/1119) Added support to provide redis sentinel when using redis cache. + ### Changed * [#1142](https://github.com/shlinkio/shlink/issues/1142) Replaced `doctrine/cache` package with `symfony/cache`. * [#1157](https://github.com/shlinkio/shlink/issues/1157) All routes now support CORS, not only rest ones.