fix: fix dynamic requires

softwaregroup-bg · Oct 19, 2016 · 33228c1 · 33228c1
1 parent 7f35691
commit 33228c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -83,7 +83,11 @@ var lib = {
  **/
 function Logger(options) {
     options.lib = lib;
-    this.init(require('./modules/' + (options.type || 'winston'))(options));
+    if (options.type === 'winston') {
+        this.init(require('./modules/winston')(options));
+    } else { // require bunyan by default
+        this.init(require('./modules/bunyan')(options));
+    }
 }
 
 Logger.prototype.init = function LoggerInit(logger) {

diff --git a/modules/bunyan.js b/modules/bunyan.js
@@ -26,7 +26,7 @@ function fixStreams(streams, workDir) {
                 stream.stream = process.stdout;
             }
         } else if (typeof stream.stream === 'string') {
-            createStream = require(stream.stream);
+            createStream = serverRequire(stream.stream);
             stream.streamConfig.workDir = workDir;
             stream.stream = createStream(stream.streamConfig);
             delete stream.streamConfig;

diff --git a/modules/winston.js b/modules/winston.js
@@ -44,12 +44,6 @@ function Winston(options) {
         });
         transports = fixStreams(options.streams);
     }
-    var dependencies = options.dependencies;
-    if (dependencies && dependencies.length) {
-        dependencies.forEach(function(element) {
-            require(element); // try catch maybe
-        });
-    }
 
     return function createLogger(params) {
         var log = container.add(params.name || options.name, transports);