github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-14 10:15:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adding better exception handling to match everything else

Browse Source
This commit is contained in:
Tanya Byrne
2020-08-17 17:44:35 +01:00
parent 7dec7253ca
commit eee7746165
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import { RequestHandler } from 'express';
import redis from 'redis';
import { RateLimiterRedis } from 'rate-limiter-flexible';
import { HitRateLimitException } from '../exceptions';
import { RedisNotFoundException } from '../exceptions';
import env from '../env';
const redisClient = redis.createClient({
@@ -21,8 +22,7 @@ const rateLimiter: RequestHandler = (req, res, next) => {
try {
// first need to check that redis is running!
if (!redisClient) {
throw new Error('Redis client does not exist');
process.exit(1);
throw new RedisNotFoundException('Redis client does not exist');
}
// options for the rate limiter are set below. Opts can be found
// at https://github.com/animir/node-rate-limiter-flexible/wiki/Options
@@ -46,8 +46,8 @@ const rateLimiter: RequestHandler = (req, res, next) => {
next();
})
.catch((rejRes) => {
if (rejRes instanceof Error) {
throw new Error('Redis insurance limiter not set up');
if (rejRes instanceof RedisNotFoundException) {
throw new RedisNotFoundException('Redis insurance limiter not set up');
} else {
// If there is no error, rateLimiterRedis promise rejected with number of ms before next request allowed
const secs = Math.round(rejRes.msBeforeNext / 1000) || 1;