summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorƁukasz Jan Niemier <lukasz@niemier.pl>2020-02-09 09:34:34 +0100
committerGitHub <noreply@github.com>2020-02-09 09:34:34 +0100
commit63118320795ee7478bf8e6751a0e09b8db9ece28 (patch)
tree7270d09b4f113a8d20c5b2581a89f8b5d25a25e0
parent840f52077afde5a24c147f69eace046a711cdbc2 (diff)
downloadelixir-63118320795ee7478bf8e6751a0e09b8db9ece28.tar.gz
fix(logger): use correct return value from report_cb/2 (#9798)
Earlier it assumed that the return type is the same as in `report_cb/1` which is not true. `report_cb/1` returns format string and data while `report_cb/2` returns already formatted string.
-rw-r--r--lib/logger/lib/logger/handler.ex4
-rw-r--r--lib/logger/test/logger/handler_test.exs2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/logger/lib/logger/handler.ex b/lib/logger/lib/logger/handler.ex
index 23cc968ff..50fd240af 100644
--- a/lib/logger/lib/logger/handler.ex
+++ b/lib/logger/lib/logger/handler.ex
@@ -232,7 +232,7 @@ defmodule Logger.Handler do
translate_fallback(:format, callback.(data), meta, truncate)
end
- defp translate_fallback(:report, {:logger, data}, %{report_cb: callback} = meta, truncate)
+ defp translate_fallback(:report, {:logger, data}, %{report_cb: callback}, _truncate)
when is_function(callback, 2) do
translator_opts =
struct(Inspect.Opts, Application.fetch_env!(:logger, :translator_inspect_opts))
@@ -243,7 +243,7 @@ defmodule Logger.Handler do
single_line: false
}
- translate_fallback(:format, callback.(data, opts), meta, truncate)
+ callback.(data, opts)
end
defp translate_fallback(:format, {format, args}, _meta, truncate) do
diff --git a/lib/logger/test/logger/handler_test.exs b/lib/logger/test/logger/handler_test.exs
index 9f403b15d..d8a2233a9 100644
--- a/lib/logger/test/logger/handler_test.exs
+++ b/lib/logger/test/logger/handler_test.exs
@@ -147,6 +147,6 @@ defmodule Logger.HandlerTest do
defp format_report(report, opts) do
send(self(), {:format, report, opts})
- {'~p', [report]}
+ inspect(report)
end
end