8000 fix for issue #100, multiprocess appender and logLevelFilter don't pl… · LikeABossProgrammer/log4js-node@a9307fd · GitHub
[go: up one dir, main page]
Skip to content

Commit a9307fd

Browse files
author
Gareth Jones
committed
fix for issue log4js-node#100, multiprocess appender and logLevelFilter don't play nicely
1 parent 4739c65 commit a9307fd

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

‎lib/appenders/multiprocess.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,15 @@ function logServer(config) {
1616
function deserializeLoggingEvent(clientSocket, msg) {
1717
var loggingEvent;
1818
try {
19-
loggingEvent = JSON.parse(msg);
20-
loggingEvent.startTime = new Date(loggingEvent.startTime);
21-
loggingEvent.level.toString = function levelToString() {
22-
return loggingEvent.level.levelStr;
23-
};
19+
loggingEvent = JSON.parse(msg);
20+
loggingEvent.startTime = new Date(loggingEvent.startTime);
21+
loggingEvent.level = log4js.levels.toLevel(loggingEvent.level.levelStr);
2422
} catch (e) {
2523
// JSON.parse failed, just log the contents probably a naughty.
2624
loggingEvent = {
2725
startTime: new Date(),
2826
categoryName: 'log4js',
29-
level: { toString: function () {
30-
return 'ERROR';
31-
}
32-
},
27+
level: log4js.levels.ERROR,
3328
data: [ 'Unable to parse log:', msg ]
3429
};
3530
}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "log4js",
3-
"version": "0.5.4",
3+
"version": "0.5.5",
44
"description": "Port of Log4js to work with node.",
55
"keywords": [
66
"logging",

‎test/multiprocess-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,14 @@ vows.describe('Multiprocess Appender').addBatch({
181181
},
182182
'when a client connects': {
183183
topic: function(net) {
184-
var logString = JSON.stringify({ level: 'DEBUG', data: ['some debug']}) + '__LOG4JS__';
184+
var logString = JSON.stringify({ level: { level: 10000, levelStr: 'DEBUG' }, data: ['some debug']}) + '__LOG4JS__';
185185

186186
net.cbs['connect']();
187-
net.cbs['data'](JSON.stringify({ level: 'ERROR', data: ['an error message'] }) + '__LOG4JS__');
187+
net.cbs['data'](JSON.stringify({ level: { level: 40000, levelStr: 'ERROR' }, data: ['an error message'] }) + '__LOG4JS__');
188188
net.cbs['data'](logString.substring(0, 10));
189189
net.cbs['data'](logString.substring(10));
190190
net.cbs['data'](logString + logString + logString);
191-
net.cbs['end'](JSON.stringify({ level: 'FATAL', data: ["that's all folks"] }) + '__LOG4JS__');
191+
net.cbs['end'](JSON.stringify({ level: { level: 50000, levelStr: 'FATAL' }, data: ["that's all folks"] }) + '__LOG4JS__');
192192
net.cbs['data']('bad message__LOG4JS__');
193193
return net;
194194
},

0 commit comments

Comments
 (0)
0