libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

allow settings to be applied from the filesystem

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/node/server.js
View file

@ -45,7 +45,7 @@ async.waterfall([
callback(er) callback(er)
}) })
}, },
// load everything // load everything
function(callback) { function(callback) {
settings = require('./utils/Settings'); settings = require('./utils/Settings');
@ -55,7 +55,7 @@ async.waterfall([
hooks.plugins = plugins; hooks.plugins = plugins;
callback(); callback();
}, },
//initalize the database //initalize the database
function (callback) function (callback)
{ {
@ -74,6 +74,16 @@ 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];
};
});
});
console.log(settings);
callback(); callback();
}, },
@ -81,6 +91,6 @@ async.waterfall([
function (callback) function (callback)
{ {
hooks.callAll("createServer", {}); hooks.callAll("createServer", {});
callback(null); callback(null);
} }
]); ]);