summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcel Klehr <mklehr@gmx.net>2012-11-06 17:35:52 +0100
committerMarcel Klehr <mklehr@gmx.net>2012-11-06 17:35:52 +0100
commitd26f5d64f7adf5c438ba01647e5b1d4c45726ac4 (patch)
tree6375656b6291521b897c4cd9c254e8d0daaaaced /src
parente702a86c9fbbacd38ad7846409b72b8575c19f38 (diff)
downloadetherpad-lite-d26f5d64f7adf5c438ba01647e5b1d4c45726ac4.zip
Fix #1130 Reload settings on /admin/settings server restart
Diffstat (limited to 'src')
-rw-r--r--src/node/hooks/express/adminsettings.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/node/hooks/express/adminsettings.js b/src/node/hooks/express/adminsettings.js
index db4df750..2a48d289 100644
--- a/src/node/hooks/express/adminsettings.js
+++ b/src/node/hooks/express/adminsettings.js
@@ -1,5 +1,6 @@
var path = require('path');
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 hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
var fs = require('fs');
@@ -44,6 +45,7 @@ exports.socketio = function (hook_name, args, cb) {
socket.on("restartServer", function () {
console.log("Admin request to restart server through a socket on /admin/settings");
+ settings.reloadSettings();
hooks.aCallAll("restartServer", {}, function () {});
});