cartodb4/log4js-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 2ion-gelf-spec-v1.1-compliance into master

Browse Source
This commit is contained in:
Gareth Jones 2014-07-12 15:12:40 +10:00
commit a06478632e
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/appenders/gelf.js
View File

@ -48,11 +48,14 @@ function gelfAppender (layout, host, port, hostname, facility) {
host = host || 'localhost'; host = host || 'localhost';
port = port || 12201; port = port || 12201;
hostname = hostname || require('os').hostname(); hostname = hostname || require('os').hostname();
facility = facility || 'nodejs-server';
layout = layout || layouts.messagePassThroughLayout; layout = layout || layouts.messagePassThroughLayout;
var defaultCustomFields = customFields || {}; var defaultCustomFields = customFields || {};
if(facility) {
defaultCustomFields['_facility'] = facility;
}
var client = dgram.createSocket("udp4"); var client = dgram.createSocket("udp4");
process.on('exit', function() { process.on('exit', function() {
@ -98,11 +101,10 @@ function gelfAppender (layout, host, port, hostname, facility) {
addCustomFields(loggingEvent, msg); addCustomFields(loggingEvent, msg);
msg.short_message = layout(loggingEvent); msg.short_message = layout(loggingEvent);
msg.version="1.0"; msg.version="1.1";
msg.timestamp = msg.timestamp || new Date().getTime() / 1000; // log should use millisecond msg.timestamp = msg.timestamp || new Date().getTime() / 1000; // log should use millisecond
msg.host = hostname; msg.host = hostname;
msg.level = levelMapping[loggingEvent.level || levels.DEBUG]; msg.level = levelMapping[loggingEvent.level || levels.DEBUG];
msg.facility = facility;
return msg; return msg;
} }

7
test/gelfAppender-test.js
View File

@ -115,10 +115,9 @@ vows.describe('log4js gelfAppender').addBatch({
return message; return message;
}, },
'should be in the gelf format': function(message) { 'should be in the gelf format': function(message) {
assert.equal(message.version, '1.0'); assert.equal(message.version, '1.1');
assert.equal(message.host, require('os').hostname()); assert.equal(message.host, require('os').hostname());
assert.equal(message.level, 6); //INFO assert.equal(message.level, 6); //INFO
assert.equal(message.facility, 'nodejs-server');
assert.equal(message.short_message, 'This is a test'); assert.equal(message.short_message, 'This is a test');
} }
} }
@ -165,7 +164,7 @@ vows.describe('log4js gelfAppender').addBatch({
}, },
'should pick up the options': function(message) { 'should pick up the options': function(message) {
assert.equal(message.host, 'cheese'); assert.equal(message.host, 'cheese');
assert.equal(message.facility, 'nonsense'); assert.equal(message._facility, 'nonsense');
} }
} }
}, },
@ -245,7 +244,7 @@ vows.describe('log4js gelfAppender').addBatch({
}, },
'should pick up the options': function(message) { 'should pick up the options': function(message) {
assert.equal(message.host, 'cheese'); assert.equal(message.host, 'cheese');
assert.equal(message.facility, 'nonsense'); assert.equal(message._facility, 'nonsense');
assert.equal(message._every1, 'Hello every one'); // the default value assert.equal(message._every1, 'Hello every one'); // the default value
assert.equal(message._every2, 'Overwritten!'); // the overwritten value assert.equal(message._every2, 'Overwritten!'); // the overwritten value
assert.equal(message._myField, 'This is my field!'); // the value for this message only assert.equal(message._myField, 'This is my field!'); // the value for this message only