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

util.watchdog: Update to use "new" util.timer API

Browse source 
When this module was written, it wasn't possible to cancel or reschedule a
timer. Times have changed, and we should take advantage of those new methods.

This module becomes a very thin wrapper around util.timer now, but I'd argue
it's still a very common and useful concept/abstraction to have around.

Possible API change: this removes the 'last_reset' field of the watchdog. This
was never really intended as a public thing, and I can't find any code that
uses it, so I consider removal to be safe.
This commit is contained in:
Matthew Wild 2022-06-11 21:11:01 +01:00
parent 325900b248
commit 49a9d5e427
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
util/watchdog.lua
View file

@ -9,27 +9,30 @@ local watchdog_methods = {};
local watchdog_mt = { __index = watchdog_methods };
local function new(timeout, callback)
local watchdog = setmetatable({ timeout = timeout, last_reset = os_time(), callback = callback }, watchdog_mt);
timer.add_task(timeout+1, function (current_time)
local last_reset = watchdog.last_reset;
if not last_reset then
return;
end
local time_left = (last_reset + timeout) - current_time;
if time_left < 0 then
return watchdog:callback();
end
return time_left + 1;
local watchdog = setmetatable({
timeout = timeout;
callback = callback;
timer_id = nil;
}, watchdog_mt);
watchdog.timer_id = timer.add_task(timeout+1, function ()
return watchdog:callback();
end);
return watchdog;
end
function watchdog_methods:reset()
self.last_reset = os_time();
if self.timer_id then
timer.reschedule(self.timer_id, self.timeout);
end
end
function watchdog_methods:cancel()
self.last_reset = nil;
if self.timer_id then
timer.stop(self.timer_id);
self.timer_id = nil;
end
end
return {