Software / code / prosody
Changeset
10986:d585deb8c882
mod_admin_shell: Fix debug:timers to handle net.server native timers
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 29 Jun 2020 21:43:51 +0200 |
| parents | 10985:758ce12586de |
| children | 10987:62355b801772 |
| files | plugins/mod_admin_shell.lua |
| diffstat | 1 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_admin_shell.lua Mon Jun 29 20:23:59 2020 +0200 +++ b/plugins/mod_admin_shell.lua Mon Jun 29 21:43:51 2020 +0200 @@ -1269,14 +1269,24 @@ local h, params = add_task.h, add_task.params; if h then print("-- util.timer"); + elseif server.timer then + print("-- net.server.timer"); + h = server.timer.add_task.timers; + end + if h then for i, id in ipairs(h.ids) do - if not params[id] then - print(os.date("%F %T", math.floor(h.priorities[i])), h.items[id]); - elseif not params[id].callback then - print(os.date("%F %T", math.floor(h.priorities[i])), h.items[id], unpack(params[id])); - else - print(os.date("%F %T", math.floor(h.priorities[i])), params[id].callback, unpack(params[id])); + local t, cb = h.priorities[i], h.items[id]; + if not params then + local param = cb.param; + if param then + cb = param.callback; + else + cb = cb.timer_callback or cb; + end + elseif params[id] then + cb = params[id].callback or cb; end + print(os.date("%F %T", math.floor(t)), cb); end end if server.event_base then
