Merge backout

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index 9d2df69ede44490de53a6b36dca856aa04595638..26183b21204af1db3b7ea35f26ea8256e2157645 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -433,6 +433,19 @@ function commands.stop(arg)
        return 1;
 end
 
+function commands.restart(arg)
+       if arg[1] == "--help" then
+               show_usage([[restart]], [[Restart a running Prosody server]]);
+               return 1;
+       end
+       
+       local ret = commands.stop(arg);
+       if ret == 0 then
+               ret = commands.start(arg);
+       end
+       return ret;
+end
+
 -- ejabberdctl compatibility
 
 function commands.register(arg)
@@ -486,33 +499,6 @@ function commands.unregister(arg)
        return 1;
 end
 
-local http_errors = {
-       [404] = "Plugin not found, did you type the address correctly?"
-       };
-
-function commands.addplugin(arg)
-       local url = arg[1];
-       if url:match("^http://") then
-               local http = require "socket.http";
-               show_message("Fetching...");
-               local code, err = http.request(url);
-               if not code or not tostring(err):match("^[23]") then
-                       show_message("Failed: "..(http_errors[err] or ("HTTP error "..err)));
-                       return 1;
-               end
-               if url:match("%.lua$") then
-                       local ok, err = datamanager.store(url:match("/mod_([^/]+)$"), "*", "plugins", {code});
-                       if not ok then
-                               show_message("Failed to save to data store: "..err);
-                               return 1;
-                       end
-               end
-               show_message("Saved. Don't forget to load the module using the config file or admin console!");
-       else
-               show_message("Sorry, I don't understand how to fetch plugins from there.");
-       end
-end
-
 ---------------------
 
 if command and command:match("^mod_") then -- Is a command in a module
@@ -562,8 +548,8 @@ if not commands[command] then -- Show help for all commands
        print("");
        print("Where COMMAND may be one of:\n");
 
-       local hidden_commands = require "util.set".new{ "register", "unregister" };
-       local commands_order = { "adduser", "passwd", "deluser" };
+       local hidden_commands = require "util.set".new{ "register", "unregister", "addplugin" };
+       local commands_order = { "adduser", "passwd", "deluser", "start", "stop", "restart" };
 
        local done = {};