Merge 6af2106be4 into 549ab089ee

Fix #29770 by only parsing REDIS_PORT and REDIS_DB variable if REDIS_URL is not used.
2024-08-20 21:08:15 -07:00 · 2024-07-31 11:04:47 +00:00 · 2024-04-15 21:54:00 +02:00
1 changed files with 6 additions and 6 deletions
--- a/streaming/index.js
+++ b/streaming/index.js
@ -241,16 +241,16 @@ const redisConfigFromEnv = (env) => {
  // which means we can't use it. But this is something that should be looked into.
  const redisPrefix = env.REDIS_NAMESPACE ? `${env.REDIS_NAMESPACE}:` : '';

-  let redisPort = parseIntFromEnv(env.REDIS_PORT, 6379, 'REDIS_PORT');
-  let redisDatabase = parseIntFromEnv(env.REDIS_DB, 0, 'REDIS_DB');
+    

  /** @type {import('ioredis').RedisOptions} */
-  const redisParams = {
+  const redisParams = typeof env.REDIS_URL !== 'string' ? {
    host: env.REDIS_HOST || '127.0.0.1',
-    port: redisPort,
-    db: redisDatabase,
+    port: parseIntFromEnv(env.REDIS_PORT, 6379, 'REDIS_PORT'),
+    db: parseIntFromEnv(env.REDIS_DB, 0, 'REDIS_DB'),
    password: env.REDIS_PASSWORD || undefined,
-  };
+  } : {};
+  

  // redisParams.path takes precedence over host and port.
  if (env.REDIS_URL && env.REDIS_URL.startsWith('unix://')) {
Author	SHA1	Message	Date
CSDUMMI	d2b3638d09	Merge `6af2106be4` into `549ab089ee`	2024-07-31 11:04:47 +00:00
CSDUMMI	6af2106be4	Fix #29770 by only parsing REDIS_PORT and REDIS_DB variable if REDIS_URL is not used.	2024-04-15 21:54:00 +02:00