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.error: Switch to util.debug traceback tables and remove display_tracebacks option

Browse source
This commit is contained in:
Matthew Wild 2020-12-09 14:51:40 +00:00
parent 600e9c1f40
commit 9d303c4eed
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
util/error.lua
View file

@ -1,16 +1,13 @@
local id = require "util.id";
local util_debug; -- only imported on-demand
-- Library configuration (see configure())
local auto_inject_traceback = false;
local display_tracebacks = false;
local error_mt = { __name = "error" };
function error_mt:__tostring()
if display_tracebacks and self.context.traceback then
return ("error<%s:%s:%s:%s>"):format(self.type, self.condition, self.text or "", self.context.traceback);
end
return ("error<%s:%s:%s>"):format(self.type, self.condition, self.text or "");
end
@ -19,11 +16,11 @@ local function is_error(e)
end
local function configure(opt)
if opt.display_tracebacks ~= nil then
display_tracebacks = opt.display_tracebacks;
end
if opt.auto_inject_traceback ~= nil then
auto_inject_traceback = opt.auto_inject_traceback;
if auto_inject_traceback then
util_debug = require "util.debug";
end
end
end
@ -53,7 +50,7 @@ local function new(e, context, registry, source)
context = context or {};
if auto_inject_traceback then
context.traceback = debug.traceback("error stack", 2);
context.traceback = util_debug.get_traceback_table(nil, 2);
end
local error_instance = setmetatable({