aboutsummaryrefslogtreecommitdiffstats
path: root/core/portmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-03-14 21:39:02 +0000
committerMatthew Wild <mwild1@gmail.com>2012-03-14 21:39:02 +0000
commit0270a3a90107621947d18bead0b5ed66054317ca (patch)
treeb44e4428b75ef45bfab6cf9e087d3d2fd3882d9e /core/portmanager.lua
parentce27bd5fe59bc640673abb52daa43110cfcd5c55 (diff)
downloadprosody-0270a3a90107621947d18bead0b5ed66054317ca.tar.gz
prosody-0270a3a90107621947d18bead0b5ed66054317ca.zip
portmanager: Add unregister_service(), and allow multiple services with the same name (they get queued)
Diffstat (limited to 'core/portmanager.lua')
-rw-r--r--core/portmanager.lua32
1 files changed, 26 insertions, 6 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua
index 103c5d44..30597628 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -13,8 +13,8 @@ end
--- Private state
--- service_name -> service_info
-local services = {};
+-- service_name -> { service_info, ... }
+local services = setmetatable({}, { __index = function (t, k) rawset(t, k, {}); return rawget(t, k); end });
-- service_name, interface (string), port (number)
local active_services = multitable.new();
@@ -55,7 +55,7 @@ module("portmanager", package.seeall);
--- Public API
function activate_service(service_name)
- local service_info = services[service_name];
+ local service_info = services[service_name][1];
if not service_info then
return nil, "Unknown service: "..service_name;
end
@@ -102,6 +102,7 @@ function activate_service(service_name)
end
end
log("info", "Activated service '%s'", service_name);
+ return true;
end
function deactivate(service_name)
@@ -118,16 +119,35 @@ function deactivate(service_name)
end
function register_service(service_name, service_info)
- services[service_name] = service_info;
+ table.insert(services[service_name], service_info);
- if not active_services[service_name] then
- activate_service(service_name);
+ if not active_services:get(service_name) then
+ log("debug", "No active service for %s, activating...", service_name);
+ local ok, err = activate_service(service_name);
+ if not ok then
+ log("error", "Failed to activate service '%s': %s", service_name, err or "unknown error");
+ end
end
fire_event("service-added", { name = service_name, service = service_info });
return true;
end
+function unregister_service(service_name, service_info)
+ local service_info_list = services[service_name];
+ for i, service in ipairs(service_info_list) do
+ if service == service_info then
+ table.remove(service_info_list, i);
+ end
+ end
+ if active_services[service_name] == service_info then
+ deactivate(service_name);
+ if #service_info_list > 0 then -- Other services registered with this name
+ activate(service_name); -- Re-activate with the next available one
+ end
+ end
+end
+
function get_service(service_name)
return services[service_name];
end