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

Make express restart - I think this reloads settings

Browse Source
This commit is contained in:
johnyma22 2012-11-02 15:21:12 +00:00
parent 1d055f2cd4
commit 2f123970e6
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
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 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 fs = require('fs'); var fs = require('fs');
exports.expressCreateServer = function (hook_name, args, cb) { exports.expressCreateServer = function (hook_name, args, cb) {
@ -41,20 +42,11 @@ exports.socketio = function (hook_name, args, cb) {
}); });
}); });
/* socket.on("restartServer", function () {
socket.on("install", function (plugin_name) { console.log("Admin request to restart server through a socket on /admin/settings");
socket.emit("progress", {progress:0, message:'Downloading and installing ' + plugin_name + "..."}); hooks.aCallAll("restartServer", {}, function () {});
installer.install(plugin_name, function (progress) {
socket.emit("progress", progress);
});
}); });
socket.on("uninstall", function (plugin_name) {
socket.emit("progress", {progress:0, message:'Uninstalling ' + plugin_name + "..."});
installer.uninstall(plugin_name, function (progress) {
socket.emit("progress", progress);
});
});
*/
}); });
} }

2
src/static/js/admin/settings.js
View File

@ -38,7 +38,7 @@ $(document).ready(function () {
/* Tell Etherpad Server to restart */ /* Tell Etherpad Server to restart */
$('#restartEtherpad').on('click', function(){ $('#restartEtherpad').on('click', function(){
socket.emit("restartEtherpad"); socket.emit("restartServer");
}); });
socket.on('saveprogress', function(progress){ socket.on('saveprogress', function(progress){