From deaef3ab8699a4646fe56891c825e8cb8589e73f Mon Sep 17 00:00:00 2001
From: Scott Yoshizawa <scott1y@us.ibm.com>
Date: Fri, 1 May 2015 09:37:23 -0400
Subject: [PATCH] Corrected based on knolleary's comments.

---
 red/log.js           | 29 ++++++++++++++---------------
 test/red/log_spec.js | 14 +++++++-------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/red/log.js b/red/log.js
index d3160e228..e730c3e0f 100644
--- a/red/log.js
+++ b/red/log.js
@@ -47,11 +47,6 @@ var LogHandler = function(settings) {
     this.metricsOn = settings ? settings.metrics||false : false;
     metricsEnabled = this.metricsOn;
     this.handler   = (settings && settings.handler) ? settings.handler(settings) : consoleLogger;
-    //if (settings && settings.handler) {
-        //this.handler   = settings.handler(settings);
-    //} else {
-        //this.handler   = consoleLogger;
-    //}
     this.on("log",function(msg) {
         if (this.shouldReportMessage(msg.level)) {
             this.handler(msg);
@@ -84,17 +79,21 @@ var log = module.exports = {
     init: function(settings) {
         logHandlers = [];
         var loggerSettings = {};
-        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));
-                //}
+        if (settings.logging) {
+            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());
         }
     },
     addHandler: function(func) {
diff --git a/test/red/log_spec.js b/test/red/log_spec.js
index ff0c4c3e2..08d6d4e3f 100644
--- a/test/red/log_spec.js
+++ b/test/red/log_spec.js
@@ -144,7 +144,7 @@ describe("red/log", function() {
         sinon.assert.neverCalledWithMatch(util.log,"[trace] This is a trace");
         sinon.assert.neverCalledWithMatch(util.log,"[metric] ");
     });
-    it('uses console logger if custom logger handler does not exist', function() {
+    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");
@@ -153,11 +153,11 @@ describe("red/log", function() {
         log.debug("This is a debug");
         log.trace("This is a trace");
         log.log({level:log.METRIC,msg:"testMetric"});
-        sinon.assert.calledWithMatch(util.log,"[error] This is an error");
-        sinon.assert.calledWithMatch(util.log,"[warn] This is a warn");
-        sinon.assert.calledWithMatch(util.log,"[info] This is an info");
-        sinon.assert.calledWithMatch(util.log,"[debug] This is a debug");
-        sinon.assert.calledWithMatch(util.log,"[trace] This is a trace");
-        sinon.assert.calledWithMatch(util.log,"[metric] ");
+        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] ");
     });
 });