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: Use is_error() instead of is_err() everywhere

Browse source 
Continuation of 4b39691a274e
This commit is contained in:
Kim Alvefur 2024-10-29 14:10:02 +01:00
parent ff05b0773d
commit 73b512d3a6
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/http/server.lua
View file

@ -206,7 +206,7 @@ local function handle_result(request, response, result)
end end
elseif result_type == "string" then elseif result_type == "string" then
body = result; body = result;
elseif errors.is_err(result) then elseif errors.is_error(result) then
response.status_code = result.code or 500; response.status_code = result.code or 500;
body = events.fire_event("http-error", { request = request, response = response, code = result.code or 500, 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

2
plugins/mod_s2s.lua
View file

@ -153,7 +153,7 @@ local function bounce_sendq(session, reason)
if session.had_stream then -- set when a stream is opened by the remote if session.had_stream then -- set when a stream is opened by the remote
error_type, condition = "wait", "remote-server-timeout"; error_type, condition = "wait", "remote-server-timeout";
end end
if errors.is_err(reason) then if errors.is_error(reason) then
error_type, condition, reason_text = reason.type, reason.condition, reason.text; error_type, condition, reason_text = reason.type, reason.condition, reason.text;
elseif type(reason) == "string" then elseif type(reason) == "string" then
reason_text = reason; reason_text = reason;

14
spec/util_error_spec.lua
View file

@ -29,10 +29,10 @@ describe("util.error", function ()
end); end);
describe("is_err()", function () describe("is_error()", function ()
it("works", function () it("works", function ()
assert.truthy(errors.is_err(errors.new())); assert.truthy(errors.is_error(errors.new()));
assert.falsy(errors.is_err("not an error")); assert.falsy(errors.is_error("not an error"));
end); end);
end); end);
@ -40,7 +40,7 @@ describe("util.error", function ()
it("works", function () it("works", function ()
local ok, err = errors.coerce(nil, "it dun goofed"); local ok, err = errors.coerce(nil, "it dun goofed");
assert.is_nil(ok); assert.is_nil(ok);
assert.truthy(errors.is_err(err)) assert.truthy(errors.is_error(err))
end); end);
end); end);
@ -50,7 +50,7 @@ describe("util.error", function ()
local m = st.message({ type = "chat" }); local m = st.message({ type = "chat" });
local e = st.error_reply(m, "modify", "bad-request", nil, "error.example"):tag("extra", { xmlns = "xmpp:example.test" }); local e = st.error_reply(m, "modify", "bad-request", nil, "error.example"):tag("extra", { xmlns = "xmpp:example.test" });
local err = errors.from_stanza(e); local err = errors.from_stanza(e);
assert.truthy(errors.is_err(err)); assert.truthy(errors.is_error(err));
assert.equal("modify", err.type); assert.equal("modify", err.type);
assert.equal("bad-request", err.condition); assert.equal("bad-request", err.condition);
assert.equal(e, err.context.stanza); assert.equal(e, err.context.stanza);
@ -187,7 +187,7 @@ describe("util.error", function ()
end end
local ok, err = reg.coerce(test()); local ok, err = reg.coerce(test());
assert.is_nil(ok); assert.is_nil(ok);
assert.is_truthy(errors.is_err(err)); assert.is_truthy(errors.is_error(err));
assert.equal("forbidden", err.condition); assert.equal("forbidden", err.condition);
end); end);
@ -208,7 +208,7 @@ describe("util.error", function ()
end end
local ok, err = reg.coerce(test()); local ok, err = reg.coerce(test());
assert.is_nil(ok); assert.is_nil(ok);
assert.is_truthy(errors.is_err(err)); assert.is_truthy(errors.is_error(err));
assert.equal("internal-server-error", err.condition); assert.equal("internal-server-error", err.condition);
assert.equal("Oh no", err.text); assert.equal("Oh no", err.text);
end); end);