Mercurial > prosody-hg

diff plugins/mod_muc_mam.lua @ 10682:62ef68f95b6f 0.11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mod_mam,mod_muc_mam: Allow other work to be performed during archive cleanup (fixes #1504) This lets Prosody handle socket related work between each step in the cleanup in order to prevent the server from being completely blocked during this. An async storage backend would not need this but those are currently rare.
author Kim Alvefur <zash@zash.se>
date Wed, 11 Mar 2020 21:15:01 +0100
parents 5376f882cf82
children 2f0b7f1d5e75 e042b0c8b310
line wrap: on
line diff
--- a/plugins/mod_muc_mam.lua	Wed Mar 11 18:07:03 2020 +0100
+++ b/plugins/mod_muc_mam.lua	Wed Mar 11 21:15:01 2020 +0100
@@ -437,7 +437,8 @@
 		end
 	end
 
-	cleanup_runner = require "util.async".runner(function ()
+	local async = require "util.async";
+	cleanup_runner = async.runner(function ()
 		local rooms = {};
 		local cut_off = datestamp(os.time() - cleanup_after);
 		for date in cleanup_storage:users() do
@@ -466,6 +467,9 @@
 				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);
 	end);