mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-23 10:32:17 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(core): Don't let bull override the default redis config (#6897)

Browse source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2023-08-09 18:10:58 +02:00 committed by GitHub
parent 734d27fb7f
commit cfeb322b3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/cli/src/services/redis/RedisServiceHelper.ts
View file

@ -46,6 +46,7 @@ export function getRedisStandardClient(
const { host, port, username, password, db }: RedisOptions = config.getEnv('queue.bull.redis'); const { host, port, username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold'); const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
const sharedRedisOptions: RedisOptions = { const sharedRedisOptions: RedisOptions = {
...redisOptions,
host, host,
port, port,
username, username,
@ -53,7 +54,6 @@ export function getRedisStandardClient(
db, db,
enableReadyCheck: false, enableReadyCheck: false,
maxRetriesPerRequest: null, maxRetriesPerRequest: null,
...redisOptions,
}; };
LoggerProxy.debug( LoggerProxy.debug(
`Initialising Redis client${redisType ? ` of type ${redisType}` : ''} connection with host: ${ `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 { username, password, db }: RedisOptions = config.getEnv('queue.bull.redis');
const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold'); const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
const sharedRedisOptions: RedisOptions = { const sharedRedisOptions: RedisOptions = {
...redisOptions,
username, username,
password, password,
db, db,
enableReadyCheck: false, enableReadyCheck: false,
maxRetriesPerRequest: null, maxRetriesPerRequest: null,
...redisOptions,
}; };
LoggerProxy.debug( LoggerProxy.debug(
`Initialising Redis cluster${ `Initialising Redis cluster${