# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1327277235 0
# Node ID c686860ef410c7c49411c97673fe2abd470cd4d5
# Parent  c9b91ddc9c11ad31284681e0657e02581a962215
portmanager: Pass port to friendly_error_message()

diff -r c9b91ddc9c11 -r c686860ef410 core/portmanager.lua
--- a/core/portmanager.lua	Mon Jan 23 00:00:10 2012 +0000
+++ b/core/portmanager.lua	Mon Jan 23 00:07:15 2012 +0000
@@ -21,7 +21,7 @@
 
 --- Private helpers
 
-local function error_to_friendly_message(service_name, err)
+local function error_to_friendly_message(service_name, port, err)
 	local friendly_message = err;
 	if err:match(" in use") then
 		-- FIXME: Use service_name here
@@ -90,7 +90,7 @@
 			else
 				local handler, err = server.addserver(interface, port, listener, mode, ssl);
 				if not handler then
-					log("error", "Failed to open server port %d on %s, %s", port, interface, error_to_friendly_message(service_name, err));
+					log("error", "Failed to open server port %d on %s, %s", port, interface, error_to_friendly_message(service_name, port, err));
 				else
 					log("debug", "Added listening service %s to [%s]:%d", service_name, interface, port);
 					active_services:add(service_name, interface, port, {