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

util.debug: Re-fix parameter handling (I think it matches debug.traceback() more accurately now) and document level fudge

Browse source
This commit is contained in:
Matthew Wild 2012-04-28 16:20:26 +01:00
parent e8d147c96a
commit 04a6860173
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
util/debug.lua
View file

@ -119,21 +119,26 @@ end
function _traceback(thread, message, level)
if type(thread) ~= "thread" then
-- Lua manual says: debug.traceback ([thread,] [message [, level]])
-- I fathom this to mean one of:
-- ()
-- (thread)
-- (message, level)
-- (thread, message, level)
if thread == nil then -- Defaults
thread, message, level = coroutine.running(), message, level;
elseif type(thread) == "string" then
thread, message, level = coroutine.running(), thread, message;
elseif type(thread) ~= "thread" then
return nil; -- debug.traceback() does this
end
if level and type(message) ~= "string" then
return nil, "invalid message";
elseif not level then
if type(message) == "number" then
level, message = message, nil;
else
level = 1;
end
end
level = level or 1;
message = message and (message.."\n") or "";
-- +3 counts for this function, and the pcall() and wrapper above us
local levels = get_traceback_table(thread, level+3);
local last_source_desc;