Issue #769, added code which attempts to load the configuration file …

…passed in on the command line. If not found, tries ./conf.js. Previously, it was only trying ./conf.js (#912)
DeviaVir · Dec 18, 2017 · d36aed8 · d36aed8
1 parent ccf9811
commit d36aed8
Showing 1 changed file with 30 additions and 6 deletions.
diff --git a/boot.js b/boot.js
@@ -3,12 +3,8 @@ var glob = require('glob')
 
 module.exports = function (cb) {
   var zenbot = require('./')()
-  try {
-    var c = require('./conf')
-  }
-  catch (e) {
-    c = {}
-  }
+  var c = getConfiguration()
+
   var defaults = require('./conf-sample')
   Object.keys(defaults).forEach(function (k) {
     if (typeof c[k] === 'undefined') {
@@ -50,4 +46,32 @@ module.exports = function (cb) {
       withMongo()
     }
   })
+
+  function getConfiguration() {
+    var conf = undefined
+
+    try {
+      var _allArgs = process.argv.slice();
+      var found = false
+
+      while (!found && _allArgs.length > 0) {
+        found = (_allArgs.shift() == '--conf');
+      }
+
+      if (found) {
+        try {
+          conf = require(_allArgs[0])
+        } catch (ee) {
+          conf = require('./conf')
+        }
+      } else {
+        conf = require('./conf')
+      }
+    }
+    catch (e) {
+      conf = {}
+    }
+
+    return conf
+  }
 }