From 0a06eb27da747c22ff8403ba9bf9f1704eb65425 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 20 Jul 2023 19:50:31 +0900
Subject: enhance(backend): 設定ファイルでioredisの全てのオプションを指定可能に
 (#11329)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(backend): 設定ファイルでioredisの全てのオプションを指定可能に

* yappa kousuru

* fix

* fix?

* fix

* Revert "fix"

This reverts commit 227f19ff3afcbbd560b831493975206263a1a5a3.

* fix
---
 packages/backend/src/queue/const.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'packages/backend/src/queue')

diff --git a/packages/backend/src/queue/const.ts b/packages/backend/src/queue/const.ts
index d240fe70e0..d49951a1c3 100644
--- a/packages/backend/src/queue/const.ts
+++ b/packages/backend/src/queue/const.ts
@@ -15,11 +15,8 @@ export const QUEUE = {
 export function baseQueueOptions(config: Config, queueName: typeof QUEUE[keyof typeof QUEUE]): Bull.QueueOptions {
 	return {
 		connection: {
-			port: config.redisForJobQueue.port,
-			host: config.redisForJobQueue.host,
-			family: config.redisForJobQueue.family == null ? 0 : config.redisForJobQueue.family,
-			password: config.redisForJobQueue.pass,
-			db: config.redisForJobQueue.db ?? 0,
+			...config.redisForJobQueue,
+			keyPrefix: undefined
 		},
 		prefix: config.redisForJobQueue.prefix ? `${config.redisForJobQueue.prefix}:queue:${queueName}` : `queue:${queueName}`,
 	};
-- 
cgit v1.2.3-freya