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

util.error: Drop registry initialization with namespace as key

Browse source 
Enough complexity with compact vs normal and with/without namespace
This commit is contained in:
Kim Alvefur 2020-09-28 23:48:02 +02:00
parent 9dbdb91c47
commit 33070035bf
2 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spec/util_error_spec.lua
View file

@ -96,8 +96,7 @@ describe("util.error", function ()
end); end);
it("compact mode works", function() it("compact mode works", function()
local reg = errors.init("test", { local reg = errors.init("test", "spec", {
namespace = "spec";
broke = {"cancel"; "internal-server-error"; "It broke :("}; broke = {"cancel"; "internal-server-error"; "It broke :("};
nope = {"auth"; "not-authorized"; "Can't let you do that Dave"; "sorry-dave"}; nope = {"auth"; "not-authorized"; "Can't let you do that Dave"; "sorry-dave"};
}); });
@ -126,26 +125,20 @@ describe("util.error", function ()
extra = {namespace = "spec"; condition = "sorry-dave"}; extra = {namespace = "spec"; condition = "sorry-dave"};
}; };
}); });
local compact1 = errors.init("test", { local compact1 = errors.init("test", "spec", {
namespace = "spec";
broke = {"cancel"; "internal-server-error"; "It broke :("}; broke = {"cancel"; "internal-server-error"; "It broke :("};
nope = {"auth"; "not-authorized"; "Can't let you do that Dave"; "sorry-dave"}; nope = {"auth"; "not-authorized"; "Can't let you do that Dave"; "sorry-dave"};
}); });
local compact2 = errors.init("test", "spec", { local compact2 = errors.init("test", {
broke = {"cancel"; "internal-server-error"; "It broke :("};
nope = {"auth"; "not-authorized"; "Can't let you do that Dave"; "sorry-dave"};
});
local compact3 = errors.init("test", {
broke = {"cancel"; "internal-server-error"; "It broke :("}; broke = {"cancel"; "internal-server-error"; "It broke :("};
nope = {"auth"; "not-authorized"; "Can't let you do that Dave"}; nope = {"auth"; "not-authorized"; "Can't let you do that Dave"};
}); });
assert.same(normal.registry, compact1.registry); assert.same(normal.registry, compact1.registry);
assert.same(normal.registry, compact2.registry);
assert.same({ assert.same({
broke = {type = "cancel"; condition = "internal-server-error"; text = "It broke :("}; broke = {type = "cancel"; condition = "internal-server-error"; text = "It broke :("};
nope = {type = "auth"; condition = "not-authorized"; text = "Can't let you do that Dave"}; nope = {type = "auth"; condition = "not-authorized"; text = "Can't let you do that Dave"};
}, compact3.registry); }, compact2.registry);
end); end);
end); end);

4
util/error.lua
View file

@ -92,10 +92,6 @@ local function init(source, namespace, registry)
if type(namespace) == "table" then if type(namespace) == "table" then
-- registry can be given as second argument if namespace is either not used -- registry can be given as second argument if namespace is either not used
registry, namespace = namespace, nil; registry, namespace = namespace, nil;
if type(registry.namespace) == "string" then
-- error templates are always type table, so this can't be one
namespace, registry.namespace = registry.namespace, nil;
end
end end
local _, protoerr = next(registry, nil); local _, protoerr = next(registry, nil);
if protoerr and type(next(protoerr)) == "number" then if protoerr and type(next(protoerr)) == "number" then