diff options
| author | Kim Alvefur <zash@zash.se> | 2020-09-28 18:39:51 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-09-28 18:39:51 +0200 |
| commit | e04db26e8fa4d0af71d79b6dbe2192917d38d379 (patch) | |
| tree | d64c07f7c26700b2a07473d9ef1581da14384973 /util/error.lua | |
| parent | 9d5d74ea0658d5d6ce7ea4360167c58eaa083a1f (diff) | |
| download | prosody-e04db26e8fa4d0af71d79b6dbe2192917d38d379.tar.gz prosody-e04db26e8fa4d0af71d79b6dbe2192917d38d379.zip | |
util.error: Add a "compact mode" for registries
Inspired by the older registry in pubsub.lib.lua
Diffstat (limited to 'util/error.lua')
| -rw-r--r-- | util/error.lua | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/util/error.lua b/util/error.lua index 47d4e7b6..2e4118ec 100644 --- a/util/error.lua +++ b/util/error.lua @@ -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; |