comparison plugins/mod_smacks.lua @ 13544:0aae6de9d323

Merge 0.12->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 02 Nov 2024 22:33:38 +0100
parents 41a587613a0e 01d2abc3d17c
children d9965707f7dc
comparison
equal deleted inserted replaced
13542:67288253d9a2 13544:0aae6de9d323
539 -- This should normally not happen, the watchdog should be canceled from session:close() 539 -- This should normally not happen, the watchdog should be canceled from session:close()
540 session.log("debug", "The session has already been resumed or replaced"); 540 session.log("debug", "The session has already been resumed or replaced");
541 return 541 return
542 end 542 end
543 543
544 session.log("debug", "Destroying session for hibernating too long"); 544 prosody.main_thread:run(function ()
545 save_old_session(session); 545 session.log("debug", "Destroying session for hibernating too long");
546 session.resumption_token = nil; 546 save_old_session(session);
547 sessionmanager.destroy_session(session, "Hibernating too long"); 547 session.resumption_token = nil;
548 sessions_expired(1); 548 sessionmanager.destroy_session(session, "Hibernating too long");
549 sessions_expired(1);
550 end);
549 end); 551 end);
550 if session.conn then 552 if session.conn then
551 local conn = session.conn; 553 local conn = session.conn;
552 c2s_sessions[conn] = nil; 554 c2s_sessions[conn] = nil;
553 session.conn = nil; 555 session.conn = nil;