From cfeb322b3b19405e2788e3ca3325fd491d5ebd28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 9 Aug 2023 18:10:58 +0200
Subject: [PATCH] fix(core): Don't let bull override the default redis config
 (#6897)

---
 packages/cli/src/services/redis/RedisServiceHelper.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/services/redis/RedisServiceHelper.ts b/packages/cli/src/services/redis/RedisServiceHelper.ts
index d996e149ce98b..7faab169bc3da 100644
--- a/packages/cli/src/services/redis/RedisServiceHelper.ts
+++ b/packages/cli/src/services/redis/RedisServiceHelper.ts
@@ -46,6 +46,7 @@ export function getRedisStandardClient(
 	const { host, port, username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
 	const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
 	const sharedRedisOptions: RedisOptions = {
+		...redisOptions,
 		host,
 		port,
 		username,
@@ -53,7 +54,6 @@ export function getRedisStandardClient(
 		db,
 		enableReadyCheck: false,
 		maxRetriesPerRequest: null,
-		...redisOptions,
 	};
 	LoggerProxy.debug(
 		`Initialising Redis client${redisType ? ` of type ${redisType}` : ''} connection with host: ${
@@ -94,12 +94,12 @@ export function getRedisClusterClient(
 	const { username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
 	const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
 	const sharedRedisOptions: RedisOptions = {
+		...redisOptions,
 		username,
 		password,
 		db,
 		enableReadyCheck: false,
 		maxRetriesPerRequest: null,
-		...redisOptions,
 	};
 	LoggerProxy.debug(
 		`Initialising Redis cluster${