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: Add a "compact mode" for registries

Browse source 
Inspired by the older registry in pubsub.lib.lua
This commit is contained in:
Kim Alvefur 2020-09-28 18:39:51 +02:00
parent 9a5debbb9f
commit 5da983d8bd
2 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
spec/util_error_spec.lua
View file

@ -94,6 +94,27 @@ describe("util.error", function ()
assert.equal("not-authorized", nope.condition);
assert.equal("Can't let you do that Dave", nope.text);
end);
it("compact mode works", function()
local reg = errors.init("test", {
namespace = "spec";
broke = {"cancel"; "internal-server-error"; "It broke :("};
nope = {"auth"; "not-authorized"; "Can't let you do that Dave"; "sorry-dave"};
});
local broke = reg.new("broke");
assert.equal("cancel", broke.type);
assert.equal("internal-server-error", broke.condition);
assert.equal("It broke :(", broke.text);
assert.is_nil(broke.extra);
local nope = reg.new("nope");
assert.equal("auth", nope.type);
assert.equal("not-authorized", nope.condition);
assert.equal("Can't let you do that Dave", nope.text);
assert.equal("spec", nope.extra.namespace);
assert.equal("sorry-dave", nope.extra.condition);
end);
end);
end);

11
util/error.lua
View file

@ -58,11 +58,14 @@ local function new(e, context, registry, source)
local error_instance = setmetatable({
instance_id = id.short();
type = template.type or "cancel";
condition = template.condition or "undefined-condition";
text = template.text;
type = template.type or template[1] or "cancel";
condition = template.condition or template[2] or "undefined-condition";
text = template.text or template[3];
code = template.code;
extra = template.extra;
extra = template.extra or (registry and registry.namespace and template[4] and {
namespace = registry.namespace;
condition = template[4]
});
context = context;
source = source;