TheThing
/
nconf-lite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fix] Fixed regression introduced by #98.

master
indexzero 2014-11-26 01:28:31 -05:00
parent 8d5fb25701
commit 09342555ba
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/nconf/stores/env.js
View File

@ -21,9 +21,14 @@ var Env = exports.Env = function (options) {
options = options || {};
this.type = 'env';
this.readOnly = true;
this.match = options.match
this.whitelist = options.whitelist || [];
this.separator = options.separator || '';
if (typeof options.match === 'function'
&& typeof options !== 'string') {
this.match = options.match;
}
if (options instanceof Array) {
this.whitelist = options;
}
@ -57,7 +62,7 @@ Env.prototype.loadEnv = function () {
return key.match(self.match) || self.whitelist.indexOf(key) !== -1
}
else if (self.match) {
return key.match(self.match)
return key.match(self.match);
}
else {
return !self.whitelist.length || self.whitelist.indexOf(key) !== -1
@ -65,7 +70,8 @@ Env.prototype.loadEnv = function () {
}).forEach(function (key) {
if (self.separator) {
self.set(common.key.apply(common, key.split(self.separator)), process.env[key]);
} else {
}
else {
self.set(key, process.env[key]);
}
});