projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_http: Make module:http_url() aware of http_host
[prosody.git]
/
util
/
timer.lua
diff --git
a/util/timer.lua
b/util/timer.lua
index e52a69179497551c6d7b70cdfcc43e0bbe3dcdca..af1e57b6d176c487b47c5e2d94e40c4eddb08247 100644
(file)
--- a/
util/timer.lua
+++ b/
util/timer.lua
@@
-27,7
+27,7
@@
if not server.event then
if delay >= current_time then
t_insert(new_data, {delay, callback});
else
if delay >= current_time then
t_insert(new_data, {delay, callback});
else
- local r = callback();
+ local r = callback(
current_time
);
if r and type(r) == "number" then
return _add_task(r, callback);
end
if r and type(r) == "number" then
return _add_task(r, callback);
end
@@
-67,7
+67,7
@@
else
function _add_task(delay, callback)
local event_handle;
event_handle = event_base:addevent(nil, 0, function ()
function _add_task(delay, callback)
local event_handle;
event_handle = event_base:addevent(nil, 0, function ()
- local ret = callback();
+ local ret = callback(
get_time()
);
if ret then
return 0, ret;
elseif event_handle then
if ret then
return 0, ret;
elseif event_handle then