aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-09-28 23:48:02 +0200
committerKim Alvefur <zash@zash.se>2020-09-28 23:48:02 +0200
commit33070035bf3e92548e69418e357bec5ca55f6266 (patch)
treef4309229137ee2a1e1c58b0f6e316222d0e0319e
parent9dbdb91c471ea765936a15af02b62e4cbf7ba7a2 (diff)
downloadprosody-33070035bf3e92548e69418e357bec5ca55f6266.tar.gz
prosody-33070035bf3e92548e69418e357bec5ca55f6266.zip
util.error: Drop registry initialization with namespace as key
Enough complexity with compact vs normal and with/without namespace
-rw-r--r--spec/util_error_spec.lua15
-rw-r--r--util/error.lua4
2 files changed, 4 insertions, 15 deletions
diff --git a/spec/util_error_spec.lua b/spec/util_error_spec.lua
index 8b995895..34edd313 100644
--- a/spec/util_error_spec.lua
+++ b/spec/util_error_spec.lua
@@ -96,8 +96,7 @@ describe("util.error", function ()
end);
it("compact mode works", function()
- local reg = errors.init("test", {
- namespace = "spec";
+ local reg = errors.init("test", "spec", {
broke = {"cancel"; "internal-server-error"; "It broke :("};
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"};
};
});
- local compact1 = 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 compact2 = errors.init("test", "spec", {
+ local compact1 = errors.init("test", "spec", {
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", {
+ local compact2 = errors.init("test", {
broke = {"cancel"; "internal-server-error"; "It broke :("};
nope = {"auth"; "not-authorized"; "Can't let you do that Dave"};
});
assert.same(normal.registry, compact1.registry);
- assert.same(normal.registry, compact2.registry);
assert.same({
broke = {type = "cancel"; condition = "internal-server-error"; text = "It broke :("};
nope = {type = "auth"; condition = "not-authorized"; text = "Can't let you do that Dave"};
- }, compact3.registry);
+ }, compact2.registry);
end);
end);
diff --git a/util/error.lua b/util/error.lua
index 5bd0f80e..132389f7 100644
--- a/util/error.lua
+++ b/util/error.lua
@@ -92,10 +92,6 @@ local function init(source, namespace, registry)
if type(namespace) == "table" then
-- registry can be given as second argument if namespace is either not used
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
local _, protoerr = next(registry, nil);
if protoerr and type(next(protoerr)) == "number" then