Diff

core/portmanager.lua @ 5554:e91db0aac408

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 01 May 2013 13:45:42 +0100
parent 5550:557583904dc5
child 5776:bd0ff8ae98a8
child 6041:a97591d2e1ad
line wrap: on
line diff
--- a/core/portmanager.lua	Mon Apr 29 11:27:17 2013 +0100
+++ b/core/portmanager.lua	Wed May 01 13:45:42 2013 +0100
@@ -112,6 +112,7 @@
 	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 @@
 					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 @@
 			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