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

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2020-03-11 22:44:41 +01:00
commit d04da8fdd9
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/mod_mam/mod_mam.lua
View file

@ -403,7 +403,8 @@ if cleanup_after ~= "never" then
end
local cleanup_time = module:measure("cleanup", "times");
cleanup_runner = require "util.async".runner(function ()
local async = require "util.async";
cleanup_runner = async.runner(function ()
local cleanup_done = cleanup_time();
local users = {};
local cut_off = datestamp(os.time() - cleanup_after);
@ -433,6 +434,9 @@ if cleanup_after ~= "never" then
cleanup_map:set(cut_off, user, true);
module:log("error", "Could not delete messages for user '%s': %s", user, err);
end
local wait, done = async.waiter();
module:add_timer(0.01, done);
wait();
end
module:log("info", "Deleted %d expired messages for %d users", sum, num_users);
cleanup_done();

6
plugins/mod_muc_mam.lua
View file

@ -486,7 +486,8 @@ if cleanup_after ~= "never" then
local cleanup_time = module:measure("cleanup", "times");
cleanup_runner = require "util.async".runner(function ()
local async = require "util.async";
cleanup_runner = async.runner(function ()
local cleanup_done = cleanup_time();
local rooms = {};
local cut_off = datestamp(os.time() - cleanup_after);
@ -516,6 +517,9 @@ if cleanup_after ~= "never" then
cleanup_map:set(cut_off, room, true);
module:log("error", "Could not delete messages for room '%s': %s", room, err);
end
local wait, done = async.waiter();
module:add_timer(0.01, done);
wait();
end
module:log("info", "Deleted %d expired messages for %d rooms", sum, num_rooms);
cleanup_done();