aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-05-13 22:32:40 +0200
committerKim Alvefur <zash@zash.se>2015-05-13 22:32:40 +0200
commit6e1bf7233685953e586445fc812c84927b6ae990 (patch)
tree21260087d0bb28343af21c1574ac34de693d9e38
parentcedc24858c35741d5131bbf4840d4f83dfb7b9bb (diff)
parentb925d6f5808918b0fc75ec04b17bc9d3b4f209a3 (diff)
downloadprosody-6e1bf7233685953e586445fc812c84927b6ae990.tar.gz
prosody-6e1bf7233685953e586445fc812c84927b6ae990.zip
Merge
-rw-r--r--core/portmanager.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua
index bbb7c215..e800cf36 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -152,7 +152,7 @@ function activate(service_name)
end
function deactivate(service_name, service_info)
- for name, interface, port, n, active_service
+ for name, interface, port, n, active_service --luacheck: ignore 213/name 213/n
in active_services:iter(service_name or service_info and service_info.name, nil, nil, nil) do
if service_info == nil or active_service.service == service_info then
close(interface, port);
@@ -192,11 +192,11 @@ function unregister_service(service_name, service_info)
end
function close(interface, port)
- local service, server = get_service_at(interface, port);
+ local service, service_server = get_service_at(interface, port);
if not service then
return false, "port-not-open";
end
- server:close();
+ service_server:close();
active_services:remove(service.name, interface, port);
log("debug", "Removed listening service %s from [%s]:%d", service.name, interface, port);
return true;
@@ -211,7 +211,7 @@ function get_service(service_name)
return (services[service_name] or {})[1];
end
-function get_active_services(...)
+function get_active_services()
return active_services;
end