TwitterAPI: Return proper error when healthcheck is disabled

This commit is contained in:
Haelwenn (lanodan) Monnier 2023-09-24 22:52:41 +02:00 committed by tusooa
parent 272271d939
commit 35090f6eac
No known key found for this signature in database
GPG Key ID: 42AEC43D48433C51
3 changed files with 6 additions and 2 deletions

View File

@ -0,0 +1 @@
TwitterAPI: Return proper error when healthcheck is disabled

View File

@ -345,13 +345,16 @@ def captcha(conn, _params) do
end
def healthcheck(conn, _params) do
with true <- Config.get([:instance, :healthcheck]),
with {:cfg, true} <- {:cfg, Config.get([:instance, :healthcheck])},
%{healthy: true} = info <- Healthcheck.system_info() do
json(conn, info)
else
%{healthy: false} = info ->
service_unavailable(conn, info)
{:cfg, false} ->
service_unavailable(conn, %{"error" => "Healthcheck disabled"})
_ ->
service_unavailable(conn, %{})
end

View File

@ -106,7 +106,7 @@ test "returns 503 when healthcheck disabled", %{conn: conn} do
|> get("/api/pleroma/healthcheck")
|> json_response_and_validate_schema(503)
assert response == %{}
assert response == %{"error" => "Healthcheck disabled"}
end
test "returns 200 when healthcheck enabled and all ok", %{conn: conn} do