mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-11-05 16:39:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'healthcheck-disabled-error' into 'develop'

Browse source 
TwitterAPI: Return proper error when healthcheck is disabled

See merge request pleroma/pleroma!3953
This commit is contained in:
Haelwenn 2023-11-14 09:41:26 +00:00
commit bf2d6abaf2
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