From bba9ed5aff180e75ac2fc0618a30b4b5c7e0ef94 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 21 Nov 2021 18:16:03 +0100 Subject: mod_mam: Switch to new cron API --- plugins/mod_mam/mod_mam.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'plugins/mod_mam/mod_mam.lua') diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index e418d60d..afbd6500 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -43,7 +43,6 @@ local archive_store = module:get_option_string("archive_store", "archive"); local archive = module:open_store(archive_store, "archive"); local cleanup_after = module:get_option_string("archive_expires_after", "1w"); -local cleanup_interval = module:get_option_number("archive_cleanup_interval", 4 * 60 * 60); local archive_item_limit = module:get_option_number("storage_archive_item_limit", archive.caps and archive.caps.quota or 1000); local archive_truncate = math.floor(archive_item_limit * 0.99); @@ -524,7 +523,7 @@ if cleanup_after ~= "never" then local cleanup_time = module:measure("cleanup", "times"); local async = require "util.async"; - cleanup_runner = async.runner(function () + module:daily("Remove expired messages", function () local cleanup_done = cleanup_time(); if archive.caps and archive.caps.wildcard_delete then @@ -580,10 +579,6 @@ if cleanup_after ~= "never" then cleanup_done(); end); - cleanup_task = module:add_timer(1, function () - cleanup_runner:run(true); - return cleanup_interval; - end); else module:log("debug", "Archive expiry disabled"); -- Don't ask the backend to count the potentially unbounded number of items, -- cgit v1.2.3