fix(config): move ssl env logic

ceastman-ibm · Mar 6, 2018 · 89ebd8f · 89ebd8f
1 parent 46ba329
commit 89ebd8f
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/config/index.js b/lib/config/index.js
@@ -1054,11 +1054,6 @@ Config.prototype._fromEnvironment = function _fromEnvironment(metadata, data) {
       return
     }
 
-    if (value === 'ssl' && !isTruthular(metadata.ssl)) {
-      logger.warn('SSL config key can no longer be disabled, not updating.')
-      return
-    }
-
     var node = metadata[value]
     if (typeof node === 'string') {
       var setting = process.env[node]
@@ -1070,6 +1065,10 @@ Config.prototype._fromEnvironment = function _fromEnvironment(metadata, data) {
         } else if (OBJECT_LIST_VARS.indexOf(node) > -1) {
           data[value] = fromObjectList(setting)
         } else if (BOOLEAN_VARS.indexOf(node) > -1) {
+          if (value === 'ssl' && !isTruthular(setting)) {
+            logger.warn('SSL config key can no longer be disabled, not updating.')
+            return
+          }
           data[value] = isTruthular(setting)
         } else if (FLOAT_VARS.indexOf(node) > -1) {
           data[value] = parseFloat(setting, 10)