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

mod_admin_telnet: Make timer:info command more robust

Browse source
This commit is contained in:
Kim Alvefur 2015-12-23 11:42:14 +01:00
parent 50b2a1dead
commit 9e88c5e954
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
plugins/mod_admin_telnet.lua
View file

@ -339,31 +339,36 @@ end
def_env.timer = {};
function def_env.timer:info()
local socket = require "socket";
local print = self.session.print;
local add_task = require"util.timer".add_task;
local h, params = add_task.h, add_task.params;
print("-- util.timer");
for i, id in ipairs(h.ids) do
if not params[id] then
print(os.date("%F %T", h.priorities[i]), h.items[id]);
elseif not params[id].callback then
print(os.date("%F %T", h.priorities[i]), h.items[id], unpack(params[id]));
else
print(os.date("%F %T", h.priorities[i]), params[id].callback, unpack(params[id]));
if h then
print("-- util.timer");
for i, id in ipairs(h.ids) do
if not params[id] then
print(os.date("%F %T", h.priorities[i]), h.items[id]);
elseif not params[id].callback then
print(os.date("%F %T", h.priorities[i]), h.items[id], unpack(params[id]));
else
print(os.date("%F %T", h.priorities[i]), params[id].callback, unpack(params[id]));
end
end
end
if server.event_base then
local count = 0;
for k, v in pairs(debug.getregistry()) do
if type(v) == "function" and v.callback == add_task._on_timer then
if type(v) == "function" and v.callback and v.callback == add_task._on_timer then
count = count + 1;
end
end
print(count .. " libevent callbacks");
end
local next_time = h:peek();
if next_time then
return true, os.date("Next event at %F %T", next_time);
if h then
local next_time = h:peek();
if next_time then
return true, os.date("Next event at %F %T (in %%.6fs)", next_time):format(next_time - socket.gettime());
end
end
return true;
end