Pass the Redis database number as an option rather than in the URL (#17194)

* Pass the Redis database number as an option rather than in the URL

* Remove rogue 'console.log'

Author: JamesMGreene

lib/redis-accessor.js

@@ -10,7 +10,7 @@ const useRealRedis = !CI && NODE_ENV !== 'test' && !!REDIS_URL
 const redisMaxDb = REDIS_MAX_DB || 15
 
 // Enable better stack traces in non-production environments
-const redisOptions = {
+const redisBaseOptions = {
   showFriendlyErrorStack: NODE_ENV !== 'production'
 }
 
@@ -22,8 +22,10 @@ class RedisAccessor {
       )
     }
 
-    const redisUrl = `${REDIS_URL}/${databaseNumber}`
-    const redisClient = useRealRedis ? new Redis(redisUrl, redisOptions) : new InMemoryRedis()
+    const redisClient = useRealRedis
+      ? new Redis(REDIS_URL, { ...redisBaseOptions, db: databaseNumber })
+      : new InMemoryRedis()
+
     this._client = redisClient
 
     this._prefix = prefix ? prefix.replace(/:+$/, '') + ':' : ''

middleware/rate-limit.js

@@ -5,7 +5,6 @@ const Redis = require('ioredis')
 const isProduction = process.env.NODE_ENV === 'production'
 const { REDIS_URL } = process.env
 const rateLimitDatabaseNumber = 0
-const redisUrl = `${REDIS_URL}/${rateLimitDatabaseNumber}`
 
 module.exports = rateLimit({
   // 1 minute (or practically unlimited outside of production)
@@ -16,5 +15,5 @@ module.exports = rateLimit({
   // Or anything with a status code less than 400
   skipSuccessfulRequests: true,
   // When available, use Redis
-  store: REDIS_URL && new RedisStore({ client: new Redis(redisUrl) })
+  store: REDIS_URL && new RedisStore({ client: new Redis(REDIS_URL, { db: rateLimitDatabaseNumber }) })
 })