Comparison

mod_smacks: Use pre-resource-unbind (0.9 feature) to fix reloadability and multiple host support

comparison

equal deleted inserted replaced

-:7bdd02056e2b
+:ce39df945de1
 			end
 		end
 	end
 end
-local _destroy_session = sessionmanager.destroy_session;
+module:hook("pre-resource-unbind", function (event)
-function sessionmanager.destroy_session(session, err)
+	local session, err = event.session, event.error;
 	if session.smacks then
 		if not session.resumption_token then
 			local queue = session.outgoing_stanza_queue;
 			if #queue > 0 then
 				module:log("warn", "Destroying session with %d unacked stanzas:", #queue);
 				-- otherwise the session resumed and re-hibernated.
 				and session.hibernating == hibernate_time then
 					session.log("debug", "Destroying session for hibernating too long");
 					session_registry[session.resumption_token] = nil;
 					session.resumption_token = nil;
-					-- This recursion back into our destroy handler is to
-					-- make sure we still handle any queued stanzas
 					sessionmanager.destroy_session(session);
 				else
 					session.log("debug", "Session resumed before hibernation timeout, all is well")
 				end
 			end);
-			return; -- Postpone destruction for now
+			return true; -- Postpone destruction for now
 		end
 	end
-	return _destroy_session(session, err);
+end);
-end
 module:hook_stanza(xmlns_sm, "resume", function (session, stanza)
 	local id = stanza.attr.previd;
 	local original_session = session_registry[id];
 	if not original_session then