fix crash from trying to reset placeholder

keis · Dec 12, 2014 · 60eb950 · 60eb950
1 parent b75c0e2
commit 60eb950
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -206,8 +206,7 @@ Hierarchy.prototype.forEachSink = function (iteratee) {
 
     // Assemble a list of all unique sinks in the hierarchy
     for (k in loggers) {
-        if (loggers.hasOwnProperty(k)) {
-            sinks = loggers[k].sinks;
+        if (loggers.hasOwnProperty(k) && (sinks = loggers[k].sinks)) {
             for (i = 0, length = sinks.length; i < length; i++) {
                 sink = sinks[i];
 

diff --git a/test/unit/test.hierarchy.coffee b/test/unit/test.hierarchy.coffee
@@ -48,8 +48,8 @@ describe "Hierarchy", ->
         assert.strictEqual subb.parent, log
 
     it "resets the sinks of all attached loggers", ->
-        suba = hier.getLogger 'foo'
-        subb = hier.getLogger 'bar'
+        suba = hier.getLogger 'foo.bar'
+        subb = hier.getLogger 'foo.baz'
 
         sinka = new Sink
         sinka.reset = sinon.stub()
@@ -66,7 +66,7 @@ describe "Hierarchy", ->
         assert.calledOnce sinka.reset
         assert.calledOnce sinkb.reset
 
-    it "reused sink is reset once", ->
+    it "resets a reused sink once", ->
         suba = hier.getLogger 'foo'
         subb = hier.getLogger 'bar'