From 8b08096436c38562fab287e0cd04a3e57dd92ab0 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 19 Feb 2019 21:31:27 +0000 Subject: logging: improve visibility into ISE errors --- lib/pleroma/web/views/error_view.ex | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/pleroma/web/views/error_view.ex b/lib/pleroma/web/views/error_view.ex index 86a1744b7..aefc844fd 100644 --- a/lib/pleroma/web/views/error_view.ex +++ b/lib/pleroma/web/views/error_view.ex @@ -4,13 +4,16 @@ defmodule Pleroma.Web.ErrorView do use Pleroma.Web, :view + require Logger def render("404.json", _assigns) do %{errors: %{detail: "Page not found"}} end - def render("500.json", _assigns) do - %{errors: %{detail: "Internal server error"}} + def render("500.json", assigns) do + Logger.error("Internal server error: #{inspect(assigns[:reason])}") + + %{errors: %{detail: "Internal server error", reason: inspect(assigns[:reason])}} end # In case no render clause matches or no -- cgit v1.2.3 From 22e2ed235d9e7ebaab313462d0d0a9fa040cd44f Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 20 Feb 2019 17:36:19 +0000 Subject: logging: only return ISE reasons in API responses when in dev or test mode --- lib/pleroma/web/views/error_view.ex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/views/error_view.ex b/lib/pleroma/web/views/error_view.ex index aefc844fd..f4c04131c 100644 --- a/lib/pleroma/web/views/error_view.ex +++ b/lib/pleroma/web/views/error_view.ex @@ -13,7 +13,11 @@ defmodule Pleroma.Web.ErrorView do def render("500.json", assigns) do Logger.error("Internal server error: #{inspect(assigns[:reason])}") - %{errors: %{detail: "Internal server error", reason: inspect(assigns[:reason])}} + if Mix.env() != :prod do + %{errors: %{detail: "Internal server error", reason: inspect(assigns[:reason])}} + else + %{errors: %{detail: "Internal server error"}} + end end # In case no render clause matches or no -- cgit v1.2.3