net.httpserver: Reduce log level of 'request left open' message

[prosody.git] / prosody

diff --git a/prosody b/prosody
index c9c56a5d3cb96737fe47a09f4016381f0e9a7941..b6247f21543aef6ee68a8d9f1993cdd880fd60a9 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -1,5 +1,5 @@
 #!/usr/bin/env lua
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -188,6 +188,7 @@ end
 
 -- 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;
        
@@ -215,10 +216,7 @@ net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "t
 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");
 
 -- Catch global accesses --
 local locked_globals_mt = { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }