Merge with 0.5

[prosody.git] / plugins / mod_console.lua

diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 3a18ec0eb92944194f43013bb5d7352f4e0fd387..73a83f1747b2733242001ad1cd8fff55755bcb88 100644 (file)
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -70,6 +70,9 @@ function console_listener.listener(conn, data)
                        if data:match("^>") then
                                data = data:gsub("^>", "");
                                useglobalenv = true;
+                       elseif data == "\004" then
+                               commands["bye"](session, data);
+                               return;
                        else
                                local command = data:lower();
                                command = data:match("^%w+") or data:match("%p");
@@ -180,6 +183,7 @@ function commands.help(session, data)
                print [[module:load(module, host) - Load the specified module on the specified host (or all hosts if none given)]]
                print [[module:reload(module, host) - The same, but unloads and loads the module (saving state if the module supports it)]]
                print [[module:unload(module, host) - The same, but just unloads the module from memory]]
+               print [[module:list(host) - List the modules loaded on the specified host]]
        elseif section == "server" then
                print [[server:version() - Show the server's version number]]
                print [[server:uptime() - Show how long the server has been running]]
@@ -324,6 +328,31 @@ function def_env.module:reload(name, hosts)
        return ok, (ok and "Module reloaded on "..count.." host"..(count ~= 1 and "s" or "")) or ("Last error: "..tostring(err));
 end
 
+function def_env.module:list(hosts)
+       if hosts == nil then
+               hosts = array.collect(keys(prosody.hosts));
+       end
+       if type(hosts) == "string" then
+               hosts = { hosts };
+       end
+       if type(hosts) ~= "table" then
+               return false, "Please supply a host or a list of hosts you would like to see";
+       end
+       
+       local print = self.session.print;
+       for _, host in ipairs(hosts) do
+               print(host..":");
+               local modules = array.collect(keys(prosody.hosts[host].modules or {})):sort();
+               if #modules == 0 then
+                       print("    No modules loaded");
+               else
+                       for _, name in ipairs(modules) do
+                               print("    "..name);
+                       end
+               end
+       end
+end
+
 def_env.config = {};
 function def_env.config:load(filename, format)
        local config_load = require "core.configmanager".load;
@@ -370,7 +399,12 @@ end
 
 function def_env.c2s:show(match_jid)
        local print, count = self.session.print, 0;
+       local curr_host;
        show_c2s(function (jid, session)
+               if curr_host ~= session.host then
+                       curr_host = session.host;
+                       print(curr_host);
+               end
                if (not match_jid) or jid:match(match_jid) then
                        count = count + 1;
                        local status, priority = "unavailable", tostring(session.priority or "-");
@@ -382,7 +416,7 @@ function def_env.c2s:show(match_jid)
                                        status = "available";
                                end
                        end
-                       print(jid.." - "..status.."("..priority..")");
+                       print("   "..jid.." - "..status.."("..priority..")");
                end             
        end);
        return true, "Total: "..count.." clients";
@@ -507,7 +541,7 @@ function def_env.s2s:close(from, to)
                if not session then 
                        print("No outgoing connection from "..from.." to "..to)
                else
-                       s2smanager.destroy_session(session);
+                       (session.close or s2smanager.destroy_session)(session);
                        count = count + 1;
                        print("Closed outgoing session from "..from.." to "..to);
                end
@@ -515,7 +549,7 @@ function def_env.s2s:close(from, to)
                -- Is an incoming connection
                for session in pairs(incoming_s2s) do
                        if session.to_host == to and session.from_host == from then
-                               s2smanager.destroy_session(session);
+                               (session.close or s2smanager.destroy_session)(session);
                                count = count + 1;
                        end
                end