libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2840 from ether/applySettings

Browse source 
allow settings to be applied from the filesystem
This commit is contained in:
John McLear 2015-11-24 14:03:51 +00:00
commit a913f57994
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/node/server.js
View file

@ -74,6 +74,15 @@ async.waterfall([
// Call loadSettings hook // Call loadSettings hook
hooks.aCallAll("loadSettings", { settings: settings }); 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];
};
});
});
callback(); callback();
}, },