From 280fed61dd26cc11774c57d3a5c9958fd5f0f7f7 Mon Sep 17 00:00:00 2001 From: Ben Date: Sat, 10 Nov 2018 17:39:39 +0000 Subject: [PATCH] Testing error handling and rate limiting - it seems broken --- src/controllers/middleware/errors/errorHandler.js | 4 +++- src/controllers/middleware/rateLimits.js | 4 +++- src/controllers/routes/router.js | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/controllers/middleware/errors/errorHandler.js b/src/controllers/middleware/errors/errorHandler.js index a7ff01b..a5ff5ca 100644 --- a/src/controllers/middleware/errors/errorHandler.js +++ b/src/controllers/middleware/errors/errorHandler.js @@ -1,6 +1,8 @@ +import {Logger} from '../../../models/logger'; export class ErrorHandler { static async newError(err, req, res, next) { - + Logger.error(err); + res.end('an error has occured'); } } diff --git a/src/controllers/middleware/rateLimits.js b/src/controllers/middleware/rateLimits.js index e5ea249..2cf4b10 100644 --- a/src/controllers/middleware/rateLimits.js +++ b/src/controllers/middleware/rateLimits.js @@ -11,8 +11,9 @@ export class RateLimits extends MiddleWare { MiddleWare.analytics(req, res, next); if (!buckets[ip]) { - Logger.debug(`New rate limiting bucket`); + Logger.debug(`New rate limiting bucket for ${ip}`); RateLimits.newBucket(ip); + next(); return; } @@ -25,6 +26,7 @@ export class RateLimits extends MiddleWare { } buckets[ip].tokens.pop(); + next(); } static newBucket(ip) { diff --git a/src/controllers/routes/router.js b/src/controllers/routes/router.js index 9a1a238..2e8ff70 100644 --- a/src/controllers/routes/router.js +++ b/src/controllers/routes/router.js @@ -42,6 +42,8 @@ export class Router { } static frontPage(req, res, next) { + // const err = "lol"; + // next(err); res.end('DEVELOPMENT SERVER'); } }