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

updated Provider.load to respect sources hierarchy

Browse source
This commit is contained in:
Jonathan Stewmon 2011-12-19 19:34:39 -06:00 committed by indexzero
parent 6b6bf85802
commit a216336290
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/nconf/provider.js
View file

@ -343,17 +343,20 @@ Provider.prototype.load = function (callback) {
}
function loadSources () {
var sourceHierarchy = self.sources.splice(0);
sourceHierarchy.reverse();
//
// If we don't have a callback and the current
// store is capable of loading synchronously
// then do so.
//
if (!callback) {
mergeSources(loadBatch(self.sources));
mergeSources(loadBatch(sourceHierarchy));
return loadBatch(getStores());
}
loadBatch(self.sources, function (err, data) {
loadBatch(sourceHierarchy, function (err, data) {
if (err) {
return callback(err);
}