aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_mam
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-09-14 02:48:34 +0200
committerKim Alvefur <zash@zash.se>2017-09-14 02:48:34 +0200
commit4c6c255113df008869577d4ec0291ff880b1273c (patch)
treeae64d69a765500ad798ce354363683ab22571fa3 /plugins/mod_mam
parent4cfc3d05d585eca546786a0273243f97b70dd20d (diff)
parent989c0783cb8fd86874f5f0bdcbdba30522e5fcb3 (diff)
downloadprosody-4c6c255113df008869577d4ec0291ff880b1273c.tar.gz
prosody-4c6c255113df008869577d4ec0291ff880b1273c.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam')
-rw-r--r--plugins/mod_mam/mod_mam.lua19
1 files changed, 14 insertions, 5 deletions
diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua
index 32dd0169..298c770c 100644
--- a/plugins/mod_mam/mod_mam.lua
+++ b/plugins/mod_mam/mod_mam.lua
@@ -56,6 +56,13 @@ local use_total = true;
local cleanup;
+local function schedule_cleanup(username)
+ if cleanup and not cleanup[username] then
+ table.insert(cleanup, username);
+ cleanup[username] = true;
+ end
+end
+
-- Handle prefs.
module:hook("iq/self/"..xmlns_mam..":prefs", function(event)
local origin, stanza = event.origin, event.stanza;
@@ -97,7 +104,7 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
local query = stanza.tags[1];
local qid = query.attr.queryid;
- if cleanup then cleanup[origin.username] = true; end
+ schedule_cleanup(origin.username);
-- Search query parameters
local qwith, qstart, qend;
@@ -304,7 +311,7 @@ local function message_handler(event, c2s)
local id = ok;
clone_for_other_handlers:tag("stanza-id", { xmlns = xmlns_st_id, by = store_user.."@"..host, id = id }):up();
event.stanza = clone_for_other_handlers;
- if cleanup then cleanup[store_user] = true; end
+ schedule_cleanup(store_user);
module:fire_event("archive-message-added", { origin = origin, stanza = clone_for_storage, for_user = store_user, id = id });
end
else
@@ -326,7 +333,9 @@ module:hook("pre-message/full", strip_stanza_id_after_other_events, -1);
local cleanup_after = module:get_option_string("archive_expires_after", "1w");
local cleanup_interval = module:get_option_number("archive_cleanup_interval", 4 * 60 * 60);
-if cleanup_after ~= "never" then
+if not archive.delete then
+ module:log("debug", "Selected storage driver does not support deletion, archives will not expire");
+elseif cleanup_after ~= "never" then
local day = 86400;
local multipliers = { d = day, w = day * 7, m = 31 * day, y = 365.2425 * day };
local n, m = cleanup_after:lower():match("(%d+)%s*([dwmy]?)");
@@ -353,13 +362,13 @@ if cleanup_after ~= "never" then
pcall(function ()
-- If this works, then we schedule cleanup for all known users on startup
for user in um.users(module.host) do
- cleanup[user] = true;
+ schedule_cleanup(user);
end
end);
-- At odd intervals, delete old messages for one user
module:add_timer(math.random(10, 60), function()
- local user = next(cleanup);
+ local user = table.remove(cleanup, 1);
if user then
module:log("debug", "Removing old messages for user %q", user);
local ok, err = archive:delete(user, { ["end"] = os.time() - cleanup_after; })