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

util.error: Move default for numeric error code to net.http.server

Browse source 
Stanza errors can also have numbers but these are a legacy thing and
rarely used, except in MUC. HTTP errors on the other hand always have a
number.
This commit is contained in:
Kim Alvefur 2019-12-14 20:28:44 +01:00
parent ffcb8303cc
commit 87d0125802
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/http/server.lua
View file

@ -191,7 +191,7 @@ local function handle_result(request, response, result)
elseif result_type == "string" then elseif result_type == "string" then
body = result; body = result;
elseif errors.is_err(result) then elseif errors.is_err(result) then
body = events.fire_event("http-error", { request = request, response = response, code = result.code, error = result }); body = events.fire_event("http-error", { request = request, response = response, code = result.code or 500, error = result });
elseif promise.is_promise(result) then elseif promise.is_promise(result) then
result:next(function (ret) result:next(function (ret)
handle_result(request, response, ret); handle_result(request, response, ret);

2
util/error.lua
View file

@ -21,7 +21,7 @@ local function new(e, context, registry)
type = template.type or "cancel"; type = template.type or "cancel";
condition = template.condition or "undefined-condition"; condition = template.condition or "undefined-condition";
text = template.text; text = template.text;
code = template.code or 500; code = template.code;
context = context or template.context or { _error_id = e }; context = context or template.context or { _error_id = e };
}, error_mt); }, error_mt);