From d021c5b0952a9efd0b24f158d6912b966aca53fe Mon Sep 17 00:00:00 2001 From: Xavier Milliard Date: Tue, 13 Dec 2011 17:27:56 +0100 Subject: [PATCH 1/2] fix custom format management --- lib/streamlogger.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/streamlogger.js b/lib/streamlogger.js index c837af5..1d8a9e2 100644 --- a/lib/streamlogger.js +++ b/lib/streamlogger.js @@ -121,12 +121,11 @@ StreamLogger.prototype.logAtLevel = function(message,level,callback) { this.emitter.emit('loggedMessage-' + levelName, message); //Check if there's a custom formatting callback - if (this.format) - var outMessage = this.format(message,levelName); - else - var outMessage = (new Date).toUTCString() + ' - ' + - levelName + ': ' + message; - + var outMessage = this.format(); + if(!outMessage) { + outMessage = (new Date).toUTCString() + ' - ' + levelName + ': ' + message; + } + for (var i = this.fstreams.length; i != 0; i--) { var fstream = this.fstreams[i - 1]; //Ideally we could trap the errors #write creates, I'm not sure From edb7717b0ec55163b6cfd6302e02a93458e09ea8 Mon Sep 17 00:00:00 2001 From: Xavier Milliard Date: Tue, 13 Dec 2011 17:53:01 +0100 Subject: [PATCH 2/2] add message and levelName in specific format callback call (fix previous fix :-( ) --- lib/streamlogger.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/streamlogger.js b/lib/streamlogger.js index 1d8a9e2..80f8ef4 100644 --- a/lib/streamlogger.js +++ b/lib/streamlogger.js @@ -121,7 +121,7 @@ StreamLogger.prototype.logAtLevel = function(message,level,callback) { this.emitter.emit('loggedMessage-' + levelName, message); //Check if there's a custom formatting callback - var outMessage = this.format(); + var outMessage = this.format(message, levelName); if(!outMessage) { outMessage = (new Date).toUTCString() + ' - ' + levelName + ': ' + message; }