mod_websocket: Fire pre-session-close event (fixes #1800) 0.12 0.12.3
authorMatthew Wild <mwild1@gmail.com>
Mon, 20 Feb 2023 18:10:15 +0000
branch0.12
changeset 12898 0598d822614f
parent 12893 94a99330ce87
child 12899 4968dce04f4b
child 12900 423f240d1173
mod_websocket: Fire pre-session-close event (fixes #1800) This event was added in a7c183bb4e64 and is required to make mod_smacks know that a session was intentionally closed and shouldn't be hibernated (see fcea4d9e7502). Because this was missing from mod_websocket's session.close(), mod_smacks would always attempt to hibernate websocket sessions even if they closed cleanly. That mod_websocket has its own copy of session.close() is something to fix another day (probably not in the stable branch). So for now this commit makes the minimal change to get things working again. Thanks to Damian and the Jitsi team for reporting.
plugins/mod_websocket.lua
--- a/plugins/mod_websocket.lua	Fri Feb 17 17:01:19 2023 +0000
+++ b/plugins/mod_websocket.lua	Mon Feb 20 18:10:15 2023 +0000
@@ -63,6 +63,9 @@
 
 local function session_close(session, reason)
 	local log = session.log or log;
+	local close_event_payload = { session = session, reason = reason };
+	module:context(session.host):fire_event("pre-session-close", close_event_payload);
+	reason = close_event_payload.reason;
 	if session.conn then
 		if session.notopen then
 			session:open_stream();