From ff4d2c73fd5a8ab08a5a5c2655eb91c96d39687e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 14 Jan 2022 15:06:33 +0100 Subject: Fix bull redis options --- server/lib/job-queue/job-queue.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'server') 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 } -- cgit v1.2.3