From: Chocobozzz <me@florianbigard.com>
Date: Fri, 14 Jan 2022 14:06:33 +0000 (+0100)
Subject: Fix bull redis options
X-Git-Tag: v4.1.0-rc.1~142
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ff4d2c73fd5a8ab08a5a5c2655eb91c96d39687e;hp=5cd0a3aeadd1cf667f748409f758ec224af6df01;p=github%2FChocobozzz%2FPeerTube.git

Fix bull redis options
---

diff --git a/server/lib/job-queue/job-queue.ts b/server/lib/job-queue/job-queue.ts
index 4c1597b33..fbc599f12 100644
--- a/server/lib/job-queue/job-queue.ts
+++ b/server/lib/job-queue/job-queue.ts
@@ -22,7 +22,6 @@ import {
 } from '../../../shared/models'
 import { logger } from '../../helpers/logger'
 import { JOB_ATTEMPTS, JOB_COMPLETED_LIFETIME, JOB_CONCURRENCY, JOB_TTL, REPEAT_JOBS, WEBSERVER } from '../../initializers/constants'
-import { Redis } from '../redis'
 import { processActivityPubCleaner } from './handlers/activitypub-cleaner'
 import { processActivityPubFollow } from './handlers/activitypub-follow'
 import { processActivityPubHttpBroadcast } from './handlers/activitypub-http-broadcast'
@@ -114,9 +113,16 @@ class JobQueue {
     this.initialized = true
 
     this.jobRedisPrefix = 'bull-' + WEBSERVER.HOST
-    const queueOptions = {
+
+    const queueOptions: Bull.QueueOptions = {
       prefix: this.jobRedisPrefix,
-      redis: Redis.getRedisClientOptions(),
+      redis: {
+        password: CONFIG.REDIS.AUTH,
+        db: CONFIG.REDIS.DB,
+        host: CONFIG.REDIS.HOSTNAME,
+        port: CONFIG.REDIS.PORT,
+        path: CONFIG.REDIS.SOCKET
+      },
       settings: {
         maxStalledCount: 10 // transcoding could be long, so jobs can often be interrupted by restarts
       }