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

mod_smacks: Destroy timed out session in async context (fixes #1884)

Browse source 
Prevents ASYNC-01 due to storage interactions in a timer.

Also considered modifying mod_c2s to allow passing arbitrary closures
into its runner thread but this seems like a big step away from the
current code for just this module.

Also considered creating a dedicated runner in mod_smacks, but ensuring
continuity across module reloads might be tricky.

We could further improve this in the next major version.
This commit is contained in:
Kim Alvefur 2024-11-02 18:10:25 +01:00
parent f964cc51bb
commit 2c61955e3a
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plugins/mod_smacks.lua
View file

@ -494,14 +494,16 @@ module:hook("pre-resource-unbind", function (event)
return
end
session.log("debug", "Destroying session for hibernating too long");
session_registry[jid.join(session.username, session.host, session.resumption_token)] = nil;
old_session_registry:set(session.username, session.resumption_token,
{ h = session.handled_stanza_count; t = os.time() });
session.resumption_token = nil;
session.resending_unacked = true; -- stop outgoing_stanza_filter from re-queueing anything anymore
sessionmanager.destroy_session(session, "Hibernating too long");
sessions_expired(1);
prosody.main_thread:run(function ()
session.log("debug", "Destroying session for hibernating too long");
session_registry[jid.join(session.username, session.host, session.resumption_token)] = nil;
old_session_registry:set(session.username, session.resumption_token,
{ h = session.handled_stanza_count; t = os.time() });
session.resumption_token = nil;
session.resending_unacked = true; -- stop outgoing_stanza_filter from re-queueing anything anymore
sessionmanager.destroy_session(session, "Hibernating too long");
sessions_expired(1);
end);
end);
if session.conn then
local conn = session.conn;