allow settings to be applied from the filesystem

This commit is contained in:
John McLear 2015-11-24 14:02:37 +00:00
parent a419a3a87d
commit 039a761eaf
1 changed files with 13 additions and 3 deletions

View File

@ -45,7 +45,7 @@ async.waterfall([
callback(er)
})
},
// load everything
function(callback) {
settings = require('./utils/Settings');
@ -55,7 +55,7 @@ async.waterfall([
hooks.plugins = plugins;
callback();
},
//initalize the database
function (callback)
{
@ -74,6 +74,16 @@ async.waterfall([
// Call loadSettings hook
hooks.aCallAll("loadSettings", { settings: settings });
// Call applySettings hook
hooks.aCallAll("applySettings", settings, function(err, newSettings){
if(!newSettings) return;
newSettings.forEach(function (settingsBlob){
for (var setting in settingsBlob){
settings[setting] = settingsBlob[setting];
};
});
});
console.log(settings);
callback();
},
@ -81,6 +91,6 @@ async.waterfall([
function (callback)
{
hooks.callAll("createServer", {});
callback(null);
callback(null);
}
]);