From e7267ecf46eabd33018d62af9768feebdc431c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Charvet=20=E9=BB=91=E7=93=9C?= Date: Mon, 18 Aug 2014 07:25:55 +0800 Subject: [PATCH 1/3] Correctly send message, level and hostname Fix issue #230 where the level would hold the message and the log level information would be lost. --- lib/appenders/loggly.js | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/lib/appenders/loggly.js b/lib/appenders/loggly.js index 9cd19f3..9ab4047 100644 --- a/lib/appenders/loggly.js +++ b/lib/appenders/loggly.js @@ -18,24 +18,18 @@ var layouts = require('../layouts') */ function logglyAppender(config, layout) { var client = loggly.createClient(config); + if(!layout) layout = passThrough; - function packageMessage(loggingEvent) { - function BaseItem(level, msg) { - this.level = level || loggingEvent.level.toString(); - this.category = loggingEvent.categoryName; - this.hostname = os.hostname().toString(); - if (typeof msg !== 'undefined') - this.msg = msg; - }; - - var formattedMsg = passThrough(loggingEvent); - return new BaseItem(formattedMsg); - }; - - return function(loggingEvent) { - var a = layout ? layout(loggingEvent) : packageMessage(loggingEvent); - client.log(a, config.tags); - }; + return function(loggingEvent) { + console.log('logging ', loggingEvent); + var msg = layout(loggingEvent); + client.log({ + msg: msg, + level: loggingEvent.level.levelStr, + category: loggingEvent.categoryName, + hostname: os.hostname().toString(), + }); + } } function configure(config) { From f9c2e780552f8f1a94bc1cb409e1c9c29a0526da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Charvet=20=E9=BB=91=E7=93=9C?= Date: Mon, 18 Aug 2014 07:31:33 +0800 Subject: [PATCH 2/3] Change spaces by tabs Keeping constitency with the rest of the code. --- lib/appenders/loggly.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/appenders/loggly.js b/lib/appenders/loggly.js index 9ab4047..eb25c9c 100644 --- a/lib/appenders/loggly.js +++ b/lib/appenders/loggly.js @@ -21,14 +21,14 @@ function logglyAppender(config, layout) { if(!layout) layout = passThrough; return function(loggingEvent) { - console.log('logging ', loggingEvent); - var msg = layout(loggingEvent); - client.log({ - msg: msg, - level: loggingEvent.level.levelStr, - category: loggingEvent.categoryName, - hostname: os.hostname().toString(), - }); + console.log('logging ', loggingEvent); + var msg = layout(loggingEvent); + client.log({ + msg: msg, + level: loggingEvent.level.levelStr, + category: loggingEvent.categoryName, + hostname: os.hostname().toString(), + }); } } From 0ecd729f49bfd091b1747c47b56cb69fc4a918d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Charvet=20=E9=BB=91=E7=93=9C?= Date: Mon, 18 Aug 2014 07:32:23 +0800 Subject: [PATCH 3/3] Remove test logging --- lib/appenders/loggly.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/appenders/loggly.js b/lib/appenders/loggly.js index eb25c9c..f3ecdbd 100644 --- a/lib/appenders/loggly.js +++ b/lib/appenders/loggly.js @@ -21,7 +21,6 @@ function logglyAppender(config, layout) { if(!layout) layout = passThrough; return function(loggingEvent) { - console.log('logging ', loggingEvent); var msg = layout(loggingEvent); client.log({ msg: msg,