annotate plugins/mod_debug_sql.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
parents 5edb0d01a94f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7176
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
1 -- Enables SQL query logging
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
2 --
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
3 -- luacheck: ignore 213/uri
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
4
8391
5edb0d01a94f mod_debug_sql: Declare itself as global module
Kim Alvefur <zash@zash.se>
parents: 7176
diff changeset
5 module:set_global();
5edb0d01a94f mod_debug_sql: Declare itself as global module
Kim Alvefur <zash@zash.se>
parents: 7176
diff changeset
6
7176
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
7 local engines = module:shared("/*/sql/connections");
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
8
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
9 for uri, engine in pairs(engines) do
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
10 engine:debug(true);
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
11 end
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
12
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
13 setmetatable(engines, {
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
14 __newindex = function (t, uri, engine)
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
15 engine:debug(true);
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
16 rawset(t, uri, engine);
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
17 end
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
18 });
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
19
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
20 function module.unload()
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
21 setmetatable(engines, nil);
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
22 for uri, engine in pairs(engines) do
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
23 engine:debug(false);
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
24 end
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
25 end
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
26
b8bbd5f91ad9 mod_debug_sql: Small plugin that enables raw SQL query logging (for debugging)
Kim Alvefur <zash@zash.se>
parents:
diff changeset
27