Merge with 0.5

[prosody.git] / prosody

diff --git a/prosody b/prosody
index e0d9f7681c8f7a8cd62bff3a56738341463f9941..e9f00598875278829e720cc1b79f6e23b5fccc0e 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -195,6 +195,7 @@ function prepare_to_start()
        local cl = require "net.connlisteners";
        -- start listening on sockets
        function net_activate_ports(option, listener, default, conntype)
+               if not cl.get(listener) then return; end
                local ports = config.get("*", "core", option.."_ports") or default;
                if type(ports) == "number" then ports = {ports} end;
                
@@ -222,10 +223,7 @@ function prepare_to_start()
        net_activate_ports("s2s", "xmppserver", {5269}, "tcp");
        net_activate_ports("component", "xmppcomponent", {}, "tcp");
        net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
-       
-       if cl.get("console") then
-               cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" })
-       end
+       net_activate_ports("console", "console", {5582}, "tcp");
 
        prosody.start_time = os.time();
 end