github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

error trap if redis is down

Browse Source
This commit is contained in:
Tanya Byrne
2020-08-25 20:17:09 +01:00
parent da043b857c
commit 7f1b29ed08
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/cli/utils/create-env/env-stub.liquid
View File

@@ -9,12 +9,7 @@
{{ database }}
####################################################################################################
# REDIS Server
{{ redisServer }}
####################################################################################################
# Rate Limiting and caching
# Rate Limiting
{{ rateLimits}}
####################################################################################################

8
api/src/cli/utils/create-env/index.ts
View File

@@ -25,12 +25,10 @@ const defaults = {
STORAGE_LOCAL_DRIVER: 'local',
STORAGE_LOCAL_ROOT: './uploads',
},
redisServer: {
SREDIS_HOST: '127.0.0.1',
SREDIS_PORT: '6379',
SREDIS_PASSWORD: null,
},
rateLimits: {
REDIS_HOST: '127.0.0.1',
REDIS_PORT: '6379',
REDIS_PASSWORD: null,
RATE_LIMIT_TYPE: 'redis',
CONSUMED_POINTS_LIMIT: 5,
CONSUMED_RESET_DURATION: 1,

4
api/src/middleware/rate-limiter.ts
View File

@@ -7,12 +7,16 @@
import { RequestHandler } from 'express';
import asyncHandler from 'express-async-handler';
import { HitRateLimitException } from '../exceptions';
import { RedisNotFoundException } from '../exceptions';
import rateLimiterConfig from '../get-rate-limiter-config';
const rateLimiter: RequestHandler = asyncHandler(async (req, res, next) => {
try {
await rateLimiterConfig.consume(req.ip);
} catch (rejRes) {
if (rejRes instanceof Error) {
throw new RedisNotFoundException('Redis is having some trouble connecting');
}
// If there is no error, rateLimiterRedis promise rejected with number of ms before next request allowed
const secs = Math.round(rejRes.msBeforeNext / 1000) || 1;
res.set('Retry-After', String(secs));