From a5adf5a1bf35fa6d917694b3da163e1e10b1fd82 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Mon, 3 Mar 2014 08:10:36 -0800 Subject: [PATCH] Tweaked status colors for production logging; applying it only when in production. --- server_setup.coffee | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/server_setup.coffee b/server_setup.coffee index 3332e0428..9d00188a7 100644 --- a/server_setup.coffee +++ b/server_setup.coffee @@ -21,14 +21,23 @@ setupRequestTimeoutMiddleware = (app) -> productionLogging = (tokens, req, res)-> status = res.statusCode - color = 31 - if(status != 200 && status != 304) - return '\x1b[90m' + req.method+ ' ' + req.originalUrl + ' '+ '\x1b[' + color + 'm' + res.statusCode+ ' \x1b[90m'+ (new Date - req._startTime)+ 'ms' + '\x1b[0m'; + color = 32 + if status >= 500 then color = 31 + else if status >= 400 then color = 33 + else if status >= 300 then color = 36 + elapsed = (new Date()) - req._startTime + elapsedColor = if elapsed < 500 then 90 else 31 + if (status isnt 200 and status isnt 304) or elapsed > 500 + return "\x1b[90m#{req.method} #{req.originalUrl} \x1b[#{color}m#{res.statusCode} \x1b[#{elapsedColor}m#{elapsed}ms\x1b[0m" + null setupExpressMiddleware = (app) -> setupRequestTimeoutMiddleware app - express.logger.format('prod', productionLogging) - app.use(express.logger('prod')) + if config.isProduction + express.logger.format('prod', productionLogging) + app.use(express.logger('prod')) + else + app.use(express.logger('dev')) app.use(express.static(path.join(__dirname, 'public'))) app.use(useragent.express()) @@ -105,6 +114,3 @@ exports.setExpressConfigurationOptions = (app) -> app.set('views', __dirname + '/app/views') app.set('view engine', 'jade') app.set('view options', { layout: false }) - - -