Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TwitterAPI: Return proper error when healthcheck is disabled

Browse Source
This commit is contained in:
Haelwenn (lanodan) Monnier 2023-09-24 22:52:41 +02:00
parent a94cf2ad4f
commit 2f6fc6a7ab
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/healthcheck-disabled-error.fix Normal file
View File

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

5
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View File

@ -345,13 +345,16 @@ defmodule Pleroma.Web.TwitterAPI.UtilController 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

2
test/pleroma/web/twitter_api/util_controller_test.exs
View File

@ -106,7 +106,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest 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