aboutsummaryrefslogtreecommitdiffstats
path: root/core/portmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-05-06 19:26:53 +0100
committerMatthew Wild <mwild1@gmail.com>2015-05-06 19:26:53 +0100
commitdaec51c435ca77914271200607841d55ff7408d7 (patch)
tree15f1682fbc9c2ea904651bcc59e99d2397b0d4a8 /core/portmanager.lua
parentba96c2f7db5ce079d7609dff90591b9872ba6143 (diff)
parenta540d613cd08b8feee096d19b727d1f5b2cab507 (diff)
downloadprosody-daec51c435ca77914271200607841d55ff7408d7.tar.gz
prosody-daec51c435ca77914271200607841d55ff7408d7.zip
Merge 0.10->trunk
Diffstat (limited to 'core/portmanager.lua')
-rw-r--r--core/portmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua
index eab2412a..bbb7c215 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -41,7 +41,7 @@ local active_services = multitable.new();
--- Private helpers
-local function error_to_friendly_message(service_name, port, err)
+local function error_to_friendly_message(service_name, port, err) --luacheck: ignore 212/service_name
local friendly_message = err;
if err:match(" in use") then
-- FIXME: Use service_name here