# HG changeset patch # User Kim Alvefur # Date 1520430415 -3600 # Node ID 5040c8ce32dd540b41fa6483df8dc25d2e455403 # Parent 48999871738711d3f7b0947424c01885c18eeaf5 Backed out changeset 97a094fdf101, interferes with 6ddddfe05a74 diff -r 489998717387 -r 5040c8ce32dd plugins/mod_mam/mod_mam.lua --- a/plugins/mod_mam/mod_mam.lua Fri Mar 02 01:51:06 2018 +0100 +++ b/plugins/mod_mam/mod_mam.lua Wed Mar 07 14:46:55 2018 +0100 @@ -334,9 +334,7 @@ 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 not archive.delete then - module:log("debug", "Selected storage driver does not support deletion, archives will not expire"); -elseif cleanup_after ~= "never" then +if 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]?)");