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

mod_cron: Make task frequencies configurable in overly generic manner

Browse source 
Requested feature for many modules, notably MAM and file sharing.
This commit is contained in:
Kim Alvefur 2023-10-22 18:58:02 +02:00
parent 76bf26057e
commit 7b882e4405
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES
View file

@ -53,6 +53,7 @@ TRUNK
- Moved all modules into the Lua namespace `prosody.`
- Forwarded header from RFC 7239 supported, disabled by default
- mod_http_file_share now uses roles framework, affecting access from e.g. components
- Intervals of mod_cron managed periodic jobs made configurable
## Removed

9
plugins/mod_cron.lua
View file

@ -2,8 +2,6 @@ module:set_global();
local async = require("prosody.util.async");
local periods = { hourly = 3600; daily = 86400; weekly = 7 * 86400 }
local active_hosts = {}
function module.add_host(host_module)
@ -29,6 +27,7 @@ function module.add_host(host_module)
if task.id == nil then
task.id = event.source.name .. "/" .. task.name:gsub("%W", "_"):lower();
end
task.period = host_module:get_option_period(task.id:gsub("/", "_") .. "_period", "1" .. task.when, 60, 86400 * 7 * 53);
task.restore = restore_task;
task.save = save_task;
module:log("debug", "%s task %s added", task.when, task.id);
@ -48,13 +47,13 @@ function module.add_host(host_module)
end
end
local function should_run(when, last)
return not last or last + periods[when] * 0.995 <= os.time()
local function should_run(task, last)
return not last or last + task.period * 0.995 <= os.time()
end
local function run_task(task)
task:restore();
if not should_run(task.when, task.last) then
if not should_run(task, task.last) then
return
end
local started_at = os.time();

10
teal-src/prosody/plugins/mod_cron.tl
View file

@ -18,6 +18,7 @@ local record task_spec
id : string -- unique id
name : string -- name or short description
when : frequency
period : number
last : integer
run : function (task_spec, integer)
save : function (task_spec, integer)
@ -29,8 +30,6 @@ local record task_event
item : task_spec
end
local periods : { frequency : integer } = { hourly = 3600, daily = 86400, weekly = 7*86400 }
local active_hosts : { string : boolean } = { }
function module.add_host(host_module : moduleapi)
@ -56,6 +55,7 @@ function module.add_host(host_module : moduleapi)
if task.id == nil then
task.id = event.source.name .. "/" .. task.name:gsub("%W", "_"):lower();
end
task.period = host_module:get_option_period(task.id:gsub("/", "_") .. "_period", "1" .. task.when, 60, 86400*7*53);
task.restore = restore_task;
task.save = save_task;
module:log("debug", "%s task %s added", task.when, task.id);
@ -75,13 +75,13 @@ function module.add_host(host_module : moduleapi)
end
end
local function should_run(when : frequency, last : integer) : boolean
return not last or last + periods[when]*0.995 <= os.time();
local function should_run(task : task_spec, last : integer) : boolean
return not last or last + task.period * 0.995 <= os.time();
end
local function run_task(task : task_spec)
task:restore();
if not should_run(task.when, task.last) then
if not should_run(task, task.last) then
return;
end
local started_at = os.time();