diff options
| author | Kim Alvefur <zash@zash.se> | 2018-03-07 14:46:55 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-03-07 14:46:55 +0100 |
| commit | db93331e685a8cdf6b9a2512a9f0ab8940fe2fd8 (patch) | |
| tree | 4e181d97065cbefed8f4e146a4c2e224b3bb8037 | |
| parent | f7bf94cd0379a9d11e59d6fcb90348d10635377e (diff) | |
| download | prosody-db93331e685a8cdf6b9a2512a9f0ab8940fe2fd8.tar.gz prosody-db93331e685a8cdf6b9a2512a9f0ab8940fe2fd8.zip | |
Backed out changeset 97a094fdf101, interferes with 6ddddfe05a74
| -rw-r--r-- | plugins/mod_mam/mod_mam.lua | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index 353fe1a2..a0e317eb 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -334,9 +334,7 @@ module:hook("pre-message/full", strip_stanza_id_after_other_events, -1); 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]?)"); |