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

Merge 0.12->trunk

Browse source
This commit is contained in:
Matthew Wild 2023-02-09 22:34:05 +00:00
commit 8bc31437bc
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/sessionmanager.lua
View file

@ -138,10 +138,6 @@ local function update_session(to_session, from_session)
end
local function destroy_session(session, err)
(session.log or log)("debug", "Destroying session for %s (%s@%s)%s",
session.full_jid or "(unknown)", session.username or "(unknown)",
session.host or "(unknown)", err and (": "..err) or "");
if session.destroyed then return; end
-- Remove session/resource from user's session list
@ -150,9 +146,16 @@ local function destroy_session(session, err)
-- Allow plugins to prevent session destruction
if host_session.events.fire_event("pre-resource-unbind", {session=session, error=err}) then
(session.log or log)("debug", "Resource unbind prevented by module");
return;
end
(session.log or log)("debug", "Unbinding resource for %s (%s@%s)%s",
session.full_jid or "(unknown)", session.username or "(unknown)",
session.host or "(unknown)", err and (": "..err) or "");
session.destroyed = true; -- Past this point the session is DOOMED!
host_session.sessions[session.username].sessions[session.resource] = nil;
full_sessions[session.full_jid] = nil;
@ -163,6 +166,10 @@ local function destroy_session(session, err)
end
host_session.events.fire_event("resource-unbind", {session=session, error=err});
else
(session.log or log)("debug", "Destroying unbound session for <%s@%s>%s",
session.username or "(unknown)", session.host or "(unknown)",
err and (": "..err) or "");
end
retire_session(session);