From d26f5d64f7adf5c438ba01647e5b1d4c45726ac4 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Tue, 6 Nov 2012 17:35:52 +0100 Subject: [PATCH] Fix #1130 Reload settings on /admin/settings server restart --- src/node/hooks/express/adminsettings.js | 2 ++ 1 file changed, 2 insertions(+) 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 () {}); });