Merge Tobias SCRAM-PLUS work

[prosody.git] / core / portmanager.lua

diff --git a/core/portmanager.lua b/core/portmanager.lua
index 1b3740cf91f444e1172c3ebd32a230d99f8245bd..95900c08483156f8f54f8fe2412e450c56e6b63b 100644 (file)
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -9,7 +9,7 @@ local set = require "util.set";
 
 local table = table;
 local setmetatable, rawset, rawget = setmetatable, rawset, rawget;
-local type, tonumber, tostring, ipairs = type, tonumber, tostring, ipairs;
+local type, tonumber, tostring, ipairs, pairs = type, tonumber, tostring, ipairs, pairs;
 
 local prosody = prosody;
 local fire_event = prosody.events.fire_event;
@@ -87,7 +87,7 @@ function activate(service_name)
        if not service_info then
                return nil, "Unknown service: "..service_name;
        end
-       
+
        local listener = service_info.listener;
 
        local config_prefix = (service_info.config_prefix or service_name).."_";
@@ -103,7 +103,7 @@ function activate(service_name)
                or listener.default_interface -- COMPAT w/pre0.9
                or default_interfaces
        bind_interfaces = set.new(type(bind_interfaces)~="table" and {bind_interfaces} or bind_interfaces);
-       
+
        local bind_ports = config.get("*", config_prefix.."ports")
                or service_info.default_ports
                or {service_info.default_port
@@ -112,7 +112,8 @@ 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
                        local port_number = tonumber(port);
@@ -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
 
@@ -186,7 +188,7 @@ function register_service(service_name, service_info)
                        log("error", "Failed to activate service '%s': %s", service_name, err or "unknown error");
                end
        end
-       
+
        fire_event("service-added", { name = service_name, service = service_info });
        return true;
 end