Adding logging & metric recording configuration via settings

red/log.js

@@ -17,17 +17,66 @@
 var util = require("util");
 var EventEmitter = require("events").EventEmitter;
 
+var logLevel;
+var metricsOn;
+
+var levels = {
+    "fatal" : 10,
+    "error" : 20,
+    "warn" : 30,
+    "info" : 40,
+    "debug" : 50,
+    "trace" : 60
+}
+
 var logHandlers = [];
 
 var ConsoleLogHandler = new EventEmitter();
 ConsoleLogHandler.on("log",function(msg) {
-   if (msg.level !== 'metric') {
+    if ((msg.level === 'metric')) {
+        if (metricsOn) {
+            util.log("["+msg.level+"] ["+msg.event+":"+ msg.nodeid+":"+ msg.msguuid+"]"+metrics);
+        }
+    } else if (shouldReportMessage(msg.level)) {
         util.log("["+msg.level+"] ["+msg.type+":"+(msg.name||msg.id)+"] "+msg.msg);
-   }
-   
+    }
 });
 
+function shouldReportMessage(msglevel) {
+    if (((msglevel === 'fatal') && (logLevel === 10)) ||
+            ((msglevel === 'error') && (logLevel >= 20)) ||
+            ((msglevel === 'warn') && (logLevel >= 30)) ||
+            ((msglevel === 'info') && (logLevel >= 40)) ||
+            ((msglevel === 'debug') && (logLevel >= 50)) ||
+            ((msglevel === 'trace') && (logLevel === 60))) {
+        return true;
+    }
+    return false;
+}
+
+
 var log = module.exports = {
+        
+    init: function(settings) {
+        if (settings.logLevel) {
+            var levelNames = Object.keys(levels);
+            levelNames.forEach(function(levelName) {
+                if (levelName === settings.logLevel) {
+                   logLevel =levels[levelName];
+                }
+            });
+        } 
+        if (!logLevel) {
+            // handles case if someone has put in garbage for the log level
+            logLevel = 40;
+        }
+        if (settings.metricsOn) {
+            metricsOn = settings.metricsOn
+        } else {
+            metricsOn = false;
+        }
+    },
+        
     addHandler: function(func) {
         logHandlers.push(func);
     },

red/nodes/Node.js

@@ -186,7 +186,7 @@ function log_helper(self, level, msg) {
 }
 
 Node.prototype.log = function(msg) {
-    log_helper(this, 'log', msg);
+    log_helper(this, 'info', msg);
 };
 
 Node.prototype.warn = function(msg) {

red/red.js

@@ -36,6 +36,7 @@ var RED = {
         userSettings.version = this.version();
         settings.init(userSettings);
         server.init(httpServer,settings);
+        log.init(userSettings);
         return server.app;
     },