aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-01-23 00:07:15 +0000
committerMatthew Wild <mwild1@gmail.com>2012-01-23 00:07:15 +0000
commit1374dd01213e64739c9f555ba3d46bb875015fb3 (patch)
tree81e28fa15ab0ab5aa5456d1ad94c5a9c85f24758
parent92cd4ec3f7782e817c6a967dce73495686ef5595 (diff)
downloadprosody-1374dd01213e64739c9f555ba3d46bb875015fb3.tar.gz
prosody-1374dd01213e64739c9f555ba3d46bb875015fb3.zip
portmanager: Pass port to friendly_error_message()
-rw-r--r--core/portmanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua
index a460cd6a..353c4a89 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -21,7 +21,7 @@ local active_services = multitable.new();
--- 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 @@ function activate_service(service_name)
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, {