mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 22:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

prosody, mod_c2s, mod_s2s: Move closing of c2s and s2s sessions to respective plugins

Browse source
This commit is contained in:
Kim Alvefur 2012-12-28 14:33:47 +01:00
parent de47f7e836
commit 3e2a8fbe1c
3 changed files with 18 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/mod_c2s.lua
View file

@ -265,6 +265,15 @@ function listener.associate_session(conn, session)
sessions[conn] = session; sessions[conn] = session;
end end
module:hook("server-stopping", function(event)
local reason = event.reason;
for _, session in pairs(sessions) do
session:close{ condition = "system-shutdown", text = reason };
end
end, 1000);
module:provides("net", { module:provides("net", {
name = "c2s"; name = "c2s";
listener = listener; listener = listener;

9
plugins/mod_s2s/mod_s2s.lua
View file

@ -506,6 +506,15 @@ end
s2sout.set_listener(listener); s2sout.set_listener(listener);
module:hook("server-stopping", function(event)
local reason = event.reason;
for _, session in pairs(sessions) do
session:close{ condition = "system-shutdown", text = reason };
end
end,500);
module:provides("net", { module:provides("net", {
name = "s2s"; name = "s2s";
listener = listener; listener = listener;

37
prosody
View file

@ -374,43 +374,6 @@ end
function cleanup() function cleanup()
log("info", "Shutdown status: Cleaning up"); log("info", "Shutdown status: Cleaning up");
prosody.events.fire_event("server-cleanup"); prosody.events.fire_event("server-cleanup");
-- Ok, we're quitting I know, but we
-- need to do some tidying before we go :)
server.setquitting(false);
log("info", "Shutdown status: Closing all active sessions");
for hostname, host in pairs(hosts) do
log("debug", "Shutdown status: Closing client connections for %s", hostname)
if host.sessions then
local reason = { condition = "system-shutdown", text = "Server is shutting down" };
if prosody.shutdown_reason then
reason.text = reason.text..": "..prosody.shutdown_reason;
end
for username, user in pairs(host.sessions) do
for resource, session in pairs(user.sessions) do
log("debug", "Closing connection for %s@%s/%s", username, hostname, resource);
session:close(reason);
end
end
end
log("debug", "Shutdown status: Closing outgoing s2s connections from %s", hostname);
if host.s2sout then
for remotehost, session in pairs(host.s2sout) do
if session.close then
session:close("system-shutdown");
else
log("warn", "Unable to close outgoing s2s session to %s, no session:close()?!", remotehost);
end
end
end
end
log("info", "Shutdown status: Closing all server connections");
server.closeall();
server.setquitting(true);
end end
-- Are you ready? :) -- Are you ready? :)