set logger to conf logger

riedel · Dec 26, 2011 · be84a4d · be84a4d
1 parent 244a3ff
commit be84a4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/cfg.js b/lib/cfg.js
@@ -29,7 +29,7 @@ var fs = require('fs'),
 
 // external libraries
 var func = require('./func.js');
-
+var log=null;
 var settings = {
   "proxy":
   {
@@ -146,7 +146,7 @@ function load() {
     if(settings.log) {
       Logger.merge_options(settings.log);
     }
-    var log = new Logger('cfg');
+    log = new Logger('cfg');
     log.info('configuration options merged');
   }
 }

diff --git a/server.js b/server.js
@@ -30,7 +30,7 @@ var fs = require('fs'),
 
 // internal libraries
 var cfg = require('./lib/cfg.js'),
-    log = new (require('./lib/log.js').Logger)('core'),
+    log = cfg.log,
     func = require('./lib/func.js'),
     ProxyRequest = require('./lib/proxy.js').ProxyRequest;