aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-01 13:45:42 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-01 13:45:42 +0100
commit333918c20296b46b7cd26a54cba1b4c3d51e5862 (patch)
tree3e00cd2af58e4602779b13c51761bd86b48ea264 /core
parent105c76f9673203559c46666b6d1ee25e059175ba (diff)
parent37094685f47c050702a6fc2f9cdd9b6b06dccd90 (diff)
downloadprosody-333918c20296b46b7cd26a54cba1b4c3d51e5862.tar.gz
prosody-333918c20296b46b7cd26a54cba1b4c3d51e5862.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
-rw-r--r--core/portmanager.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua
index 1b767a09..7a247452 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -112,6 +112,7 @@ function activate(service_name)
bind_ports = set.new(type(bind_ports) ~= "table" and { bind_ports } or bind_ports );
local mode, ssl = listener.default_mode or "*a";
+ local hooked_ports = {};
for interface in bind_interfaces do
for port in bind_ports do
@@ -152,6 +153,7 @@ function activate(service_name)
if not handler then
log("error", "Failed to open server port %d on %s, %s", port_number, interface, error_to_friendly_message(service_name, port_number, err));
else
+ table.insert(hooked_ports, "["..interface.."]:"..port_number);
log("debug", "Added listening service %s to [%s]:%d", service_name, interface, port_number);
active_services:add(service_name, interface, port_number, {
server = handler;
@@ -162,7 +164,7 @@ function activate(service_name)
end
end
end
- log("info", "Activated service '%s'", service_name);
+ log("info", "Activated service '%s' on %s", service_name, #hooked_ports == 0 and "no ports" or table.concat(hooked_ports, ", "));
return true;
end