Software / code / prosody
Changeset
11817:a67b4d4f8eef
mod_muc_mam: Merge main and RSM-specific log message into a single one
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 23 Sep 2021 15:53:39 +0200 |
| parents | 11816:eff0eeece24d |
| children | 11818:c443abff04d8 |
| files | plugins/mod_muc_mam.lua |
| diffstat | 1 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_muc_mam.lua Thu Sep 23 15:25:51 2021 +0200 +++ b/plugins/mod_muc_mam.lua Thu Sep 23 15:53:39 2021 +0200 @@ -175,12 +175,6 @@ qstart, qend = vstart, vend; end - module:log("debug", "Archive query by %s id=%s when=%s...%s", - from, - qid or stanza.attr.id, - qstart and timestamp(qstart) or "", - qend and timestamp(qend) or ""); - -- RSM stuff local qset = rsm.get(query); local qmax = m_min(qset and qset.max or default_max_items, max_max_items); @@ -188,14 +182,18 @@ local before, after = qset and qset.before or qbefore, qset and qset.after or qafter; if type(before) ~= "string" then before = nil; end - if qset then - module:log("debug", "Archive query id=%s rsm=%q", qid or stanza.attr.id, qset); - end -- A reverse query needs to be flipped local flip = reverse; -- A flip-page query needs to be the opposite of that. if query:get_child("flip-page") then flip = not flip end + module:log("debug", "Archive query by %s id=%s when=%s...%s rsm=%q", + from, + qid or stanza.attr.id, + qstart and timestamp(qstart) or "", + qend and timestamp(qend) or "", + qset); + -- Load all the data! local data, err = archive:find(room_node, { start = qstart; ["end"] = qend; -- Time range
