Software / code / prosody
File
util/gc.lua @ 13765:7c57fb2ffbb0 13.0
mod_websocket: Merge session close handling changes from mod_c2s (bug fixes)
This should bring some fixes and general robustness that mod_websocket had
missed out on. The duplicated code here is not at all ideal. To prevent this
happening again, we should figure out how to have the common logic in a single
place, while still being able to do the websocket-specific parts that we need.
The main known bug that this fixes is that it's possible for a session to get
into a non-destroyable state. For example, if we try to session:close() a
hibernating session, then session.conn is nil and the function will simply
return without doing anything. In the mod_c2s code we already handle this, and
just destroy the session. But if a hibernating websocket session is never
resumed or becomes non-resumable, it will become immortal!
By merging the fix from mod_c2s, the session should now be correctly
destroyed.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 11 Mar 2025 18:44:40 +0000 |
| parent | 12975:d10957394a3c |
line wrap: on
line source
local set = require "prosody.util.set"; local known_options = { incremental = set.new { "mode", "threshold", "speed", "step_size" }; generational = set.new { "mode", "minor_threshold", "major_threshold" }; }; if _VERSION ~= "Lua 5.4" then known_options.generational = nil; known_options.incremental:remove("step_size"); end local function configure(user, defaults) local mode = user.mode or defaults.mode or "incremental"; if not known_options[mode] then return nil, "GC mode not supported on ".._VERSION..": "..mode; end for k, v in pairs(user) do if not known_options[mode]:contains(k) then return nil, "Unknown GC parameter: "..k; elseif k ~= "mode" and type(v) ~= "number" then return nil, "parameter '"..k.."' should be a number"; end end if mode == "incremental" then if _VERSION == "Lua 5.4" then collectgarbage(mode, user.threshold or defaults.threshold, user.speed or defaults.speed, user.step_size or defaults.step_size ); else collectgarbage("setpause", user.threshold or defaults.threshold); collectgarbage("setstepmul", user.speed or defaults.speed); end elseif mode == "generational" then collectgarbage(mode, user.minor_threshold or defaults.minor_threshold, user.major_threshold or defaults.major_threshold ); end return true; end return { configure = configure; };