mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_mam: On quota hit, separately delete by time and by item count

Browse source 
This is to work around a possible SQL issue where offsets and time
stamps don't interact correctly.
This commit is contained in:
Kim Alvefur 2019-03-22 02:22:21 +01:00
parent 9393931a25
commit 2fed4a88c2
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/mod_mam/mod_mam.lua
View file

@ -302,11 +302,19 @@ local function message_handler(event, c2s)
local time = time_now(); local time = time_now();
local ok, err = archive:append(store_user, nil, clone_for_storage, time, with); local ok, err = archive:append(store_user, nil, clone_for_storage, time, with);
if not ok and err == "quota-limit" then if not ok and err == "quota-limit" then
if archive.caps and archive.caps.truncate then if type(cleanup_after) == "number" then
module:log("debug", "User '%s' over quota, trimming archive", store_user); module:log("debug", "User '%s' over quota, cleaning archive", store_user);
local cleaned = archive:delete(store_user, {
["end"] = (os.time() - cleanup_after);
});
if cleaned then
ok, err = archive:append(store_user, nil, clone_for_storage, time, with);
end
end
if not ok and (archive.caps and archive.caps.truncate) then
module:log("debug", "User '%s' over quota, truncating archive", store_user);
local truncated = archive:delete(store_user, { local truncated = archive:delete(store_user, {
truncate = archive_item_limit - 1; truncate = archive_item_limit - 1;
["end"] = type(cleanup_after) == "number" and (os.time() - cleanup_after) or nil;
}); });
if truncated then if truncated then
ok, err = archive:append(store_user, nil, clone_for_storage, time, with); ok, err = archive:append(store_user, nil, clone_for_storage, time, with);