From 1124e70a548b99078ab68f30ce67757be2cdba91 Mon Sep 17 00:00:00 2001 From: Tanya Byrne Date: Wed, 19 Aug 2020 16:41:17 +0100 Subject: [PATCH] Rearranged a little to be more logical --- api/src/utils/get-rate-limiter-config.ts | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/api/src/utils/get-rate-limiter-config.ts b/api/src/utils/get-rate-limiter-config.ts index 7f858db32f..624256c257 100644 --- a/api/src/utils/get-rate-limiter-config.ts +++ b/api/src/utils/get-rate-limiter-config.ts @@ -6,27 +6,15 @@ import { IRateLimiterOptions, } from 'rate-limiter-flexible'; import { RedisNotFoundException } from '../exceptions'; - import env from '../env'; // options for the rate limiter are set below. Opts can be found // at https://github.com/animir/node-rate-limiter-flexible/wiki/Options -const redisClient = redis.createClient({ - enable_offline_queue: false, - host: env.REDIS_HOST, - port: env.REDIS_PORT, - password: env.REDIS_PASSWORD, -}); - let rateLimiterConfig = new RateLimiterMemory(getRateLimiterConfig()); // need to pick redis or memory if (env.RATE_LIMIT_TYPE === 'redis') { rateLimiterConfig = new RateLimiterRedis(getRateLimiterRedisConfig()); - - if (!redisClient) { - throw new RedisNotFoundException('Redis client does not exist'); - } } export default rateLimiterConfig; @@ -50,6 +38,17 @@ function getRateLimiterConfig(): IRateLimiterOptions { function getRateLimiterRedisConfig(): IRateLimiterStoreOptions { const redisConfig: any = {}; + const redisClient = redis.createClient({ + enable_offline_queue: false, + host: env.REDIS_HOST, + port: env.REDIS_PORT, + password: env.REDIS_PASSWORD, + }); + + if (!redisClient) { + throw new RedisNotFoundException('Redis client does not exist'); + } + redisConfig.keyPrefix = 'rlflx'; redisConfig.storeClient = redisClient;