From b7250974099ed36e79c7907e55349d6defd71108 Mon Sep 17 00:00:00 2001 From: Thomas Aylott Date: Thu, 31 Oct 2013 19:05:51 -0400 Subject: [PATCH] log using grunt --- grunt/config/server.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/grunt/config/server.js b/grunt/config/server.js index ceab3b2bc2..d73e724266 100644 --- a/grunt/config/server.js +++ b/grunt/config/server.js @@ -4,12 +4,18 @@ module.exports = function(grunt){ function printMiddleware(req, res, next) { if (req._parsedUrl.pathname != '/print') return next(); - grunt[req.query.type || 'log'].writeln(req.query.message); + if (req.query.message.indexOf('ok') === 0){ + grunt.log.ok(req.query.message); + } else if (req.query.message.indexOf('not ok') === 0){ + grunt.log.error(req.query.message); + } else { + grunt[req.query.type || 'log'].writeln('[%s][%s]', req.headers['user-agent'], Date.now(), req.query.message); + } res.end(pxlgif); } function testResultLoggerMiddleware(req, res, next) { if (!(req.body && req.body.data)) return next(); - grunt.log.writeln(req.body.data); + grunt.log.writeln('[%s][%s]', req.headers['user-agent'], Date.now(), req.body.data); res.end('Got it, thanks!'); } @@ -20,13 +26,17 @@ module.exports = function(grunt){ hostname: '*', port: 9999, middleware: function(connect, options) { + connect.logger.token('user-agent', function(req, res){ return req.headers['user-agent']; }); + connect.logger.token('timestamp', function(req, res){ return Date.now(); }); + return [ connect.query(), printMiddleware, + + connect.logger({format:'[:user-agent][:timestamp] :method :url', stream:grunt.verbose}), connect.bodyParser(), testResultLoggerMiddleware, - connect.logger(':method :url - :referrer'), connect.static(options.base) ]; },