fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1135 from marcelklehr/fix/server-restart-settings-reload 

/admin/settings: reload settings on server restart
This commit is contained in:
John McLear 2012-11-08 08:33:56 -08:00
parent 9f76d24646 d26f5d64f7
commit 8bb8e484ee
2 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node/hooks/express/adminsettings.js
View File

@ -1,5 +1,6 @@
var path = require('path'); var path = require('path');
var eejs = require('ep_etherpad-lite/node/eejs'); var eejs = require('ep_etherpad-lite/node/eejs');
var settings = require('ep_etherpad-lite/node/utils/Settings');
var installer = require('ep_etherpad-lite/static/js/pluginfw/installer'); var installer = require('ep_etherpad-lite/static/js/pluginfw/installer');
var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks"); var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
var fs = require('fs'); var fs = require('fs');
@ -44,6 +45,7 @@ exports.socketio = function (hook_name, args, cb) {
socket.on("restartServer", function () { socket.on("restartServer", function () {
console.log("Admin request to restart server through a socket on /admin/settings"); console.log("Admin request to restart server through a socket on /admin/settings");
settings.reloadSettings();
hooks.aCallAll("restartServer", {}, function () {}); hooks.aCallAll("restartServer", {}, function () {});
}); });

83
src/node/utils/Settings.js
View File

@ -112,51 +112,58 @@ exports.abiwordAvailable = function()
} }
} }
// Discover where the settings file lives
var settingsFilename = argv.settings || "settings.json";
settingsFilename = path.resolve(path.join(root, settingsFilename));
var settingsStr;
try{
//read the settings sync
settingsStr = fs.readFileSync(settingsFilename).toString();
} catch(e){
console.warn('No settings file found. Continuing using defaults!');
}
// try to parse the settings exports.reloadSettings = function reloadSettings() {
var settings; // Discover where the settings file lives
try { var settingsFilename = argv.settings || "settings.json";
if(settingsStr) { settingsFilename = path.resolve(path.join(root, settingsFilename));
settings = vm.runInContext('exports = '+settingsStr, vm.createContext(), "settings.json");
var settingsStr;
try{
//read the settings sync
settingsStr = fs.readFileSync(settingsFilename).toString();
} catch(e){
console.warn('No settings file found. Continuing using defaults!');
} }
}catch(e){
console.error('There was an error processing your settings.json file: '+e.message);
process.exit(1);
}
//loop trough the settings // try to parse the settings
for(var i in settings) var settings;
{ try {
//test if the setting start with a low character if(settingsStr) {
if(i.charAt(0).search("[a-z]") !== 0) settings = vm.runInContext('exports = '+settingsStr, vm.createContext(), "settings.json");
}
}catch(e){
console.error('There was an error processing your settings.json file: '+e.message);
process.exit(1);
}
//loop trough the settings
for(var i in settings)
{ {
console.warn("Settings should start with a low character: '" + i + "'"); //test if the setting start with a low character
if(i.charAt(0).search("[a-z]") !== 0)
{
console.warn("Settings should start with a low character: '" + i + "'");
}
//we know this setting, so we overwrite it
//or it's a settings hash, specific to a plugin
if(exports[i] !== undefined || i.indexOf('ep_')==0)
{
exports[i] = settings[i];
}
//this setting is unkown, output a warning and throw it away
else
{
console.warn("Unknown Setting: '" + i + "'. This setting doesn't exist or it was removed");
}
} }
//we know this setting, so we overwrite it if(exports.dbType === "dirty"){
//or it's a settings hash, specific to a plugin console.warn("DirtyDB is used. This is fine for testing but not recommended for production.")
if(exports[i] !== undefined || i.indexOf('ep_')==0)
{
exports[i] = settings[i];
}
//this setting is unkown, output a warning and throw it away
else
{
console.warn("Unknown Setting: '" + i + "'. This setting doesn't exist or it was removed");
} }
} }
if(exports.dbType === "dirty"){ // initially load settings
console.warn("DirtyDB is used. This is fine for testing but not recommended for production.") exports.reloadSettings();
}