frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #633 from scott1y/Issue#626

Browse Source 
Added the capability to register custom loggers (for Issue #626)
This commit is contained in:
Nick O'Leary 2015-05-02 21:53:07 +01:00
commit 0c5c3448d0
2 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
red/log.js
View File

@ -42,26 +42,31 @@ var logHandlers = [];
var metricsEnabled = false; var metricsEnabled = false;
var ConsoleLogHandler = function(settings) { var LogHandler = function(settings) {
this.logLevel = levels[settings.level]||levels.info; this.logLevel = settings ? levels[settings.level]||levels.info : levels.info;
this.metricsOn = settings.metrics||false; this.metricsOn = settings ? settings.metrics||false : false;
metricsEnabled = this.metricsOn; metricsEnabled = this.metricsOn;
this.handler = (settings && settings.handler) ? settings.handler(settings) : consoleLogger;
this.on("log",function(msg) { this.on("log",function(msg) {
if (this.shouldReportMessage(msg.level)) { if (this.shouldReportMessage(msg.level)) {
if (msg.level == log.METRIC) { this.handler(msg);
util.log("[metric] "+JSON.stringify(msg));
} else {
util.log("["+levelNames[msg.level]+"] "+(msg.type?"["+msg.type+":"+(msg.name||msg.id)+"] ":"")+msg.msg);
}
} }
}); });
} }
util.inherits(ConsoleLogHandler, EventEmitter); util.inherits(LogHandler, EventEmitter);
ConsoleLogHandler.prototype.shouldReportMessage = function(msglevel) { LogHandler.prototype.shouldReportMessage = function(msglevel) {
return msglevel <= this.logLevel || (msglevel == log.METRIC && this.metricsOn); return msglevel <= this.logLevel || (msglevel == log.METRIC && this.metricsOn);
} }
var consoleLogger = function(msg) {
if (msg.level == log.METRIC) {
util.log("[metric] "+JSON.stringify(msg));
} else {
util.log("["+levelNames[msg.level]+"] "+(msg.type?"["+msg.type+":"+(msg.name||msg.id)+"] ":"")+msg.msg);
}
}
var log = module.exports = { var log = module.exports = {
FATAL: 10, FATAL: 10,
ERROR: 20, ERROR: 20,
@ -73,11 +78,23 @@ var log = module.exports = {
init: function(settings) { init: function(settings) {
logHandlers = []; logHandlers = [];
var consoleSettings = {}; var loggerSettings = {};
if (settings.logging) { if (settings.logging) {
consoleSettings = settings.logging.console || {}; var keys = Object.keys(settings.logging);
if (keys.length === 0) {
log.addHandler(new LogHandler());
} else {
for (var i=0, l=keys.length; i<l; i++) {
var config = settings.logging[keys[i]];
loggerSettings = config || {};
if ((keys[i] === "console") || config.handler) {
log.addHandler(new LogHandler(loggerSettings));
}
}
}
} else {
log.addHandler(new LogHandler());
} }
log.addHandler(new ConsoleLogHandler(consoleSettings));
}, },
addHandler: function(func) { addHandler: function(func) {
logHandlers.push(func); logHandlers.push(func);

16
test/red/log_spec.js
View File

@ -144,4 +144,20 @@ describe("red/log", function() {
sinon.assert.neverCalledWithMatch(util.log,"[trace] This is a trace"); sinon.assert.neverCalledWithMatch(util.log,"[trace] This is a trace");
sinon.assert.neverCalledWithMatch(util.log,"[metric] "); sinon.assert.neverCalledWithMatch(util.log,"[metric] ");
}); });
it('no logger used if custom logger handler does not exist', function() {
var settings = {logging: { customLogger: { level: 'trace', metrics: true } } };
log.init(settings);
log.error("This is an error");
log.warn("This is a warn");
log.info("This is an info");
log.debug("This is a debug");
log.trace("This is a trace");
log.log({level:log.METRIC,msg:"testMetric"});
sinon.assert.neverCalledWithMatch(util.log,"[error] This is an error");
sinon.assert.neverCalledWithMatch(util.log,"[warn] This is a warn");
sinon.assert.neverCalledWithMatch(util.log,"[info] This is an info");
sinon.assert.neverCalledWithMatch(util.log,"[debug] This is a debug");
sinon.assert.neverCalledWithMatch(util.log,"[trace] This is a trace");
sinon.assert.neverCalledWithMatch(util.log,"[metric] ");
});
}); });