Fixes jdan#113. debug('name') should only be called once in a module.

kirillseva · Apr 19, 2015 · 63ddb0d · 63ddb0d
1 parent 00d4243
commit 63ddb0d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/lib/helper.js b/lib/helper.js
@@ -5,6 +5,7 @@ var https = require('https');
 var fs = require('fs');
 var path = require('path');
 var normalizePath;
+var debugInited = false;
 
 
 /**
@@ -260,10 +261,13 @@ module.exports = function (inputPath, shouldDebug) {
   // variable, and manually invoke `debug.enable()`.
   // This is messy because typically debug would be called with `helper` in
   // the require line, but after that point we lose access to `.enable()`.
-  if (shouldDebug) {
-    debug.enable('*');
+  if (!debugInited) {
+    if (shouldDebug) {
+      debug.enable('*');
+    }
+    debug = debug('helper');
+    debugInited = true;
   }
-  debug = debug('helper');
 
   // TODO: I bet we can simply all this nonsense with a chdir()
   normalizePath = function (pathname) {

diff --git a/lib/index.js b/lib/index.js
@@ -8,6 +8,7 @@ var mustache = require('mustache');
 
 var clone = require('./clone');
 var helper;
+var debugInited = false;
 
 
 /**
@@ -25,10 +26,13 @@ function Cleaver(document, options, includePath) {
   this.options = clone(options) || {};
   this.path = path.resolve(includePath || '.');
 
-  if (this.options.debug) {
-    debug.enable('*');
+  if (!debugInited) {
+    if (this.options.debug) {
+      debug.enable('*');
+    }
+    debug = debug('cleaver');
+    debugInited = true;
   }
-  debug = debug('cleaver');
 
   /**
    * Require helper using `this.path` as a context for where to locate any