Skip to content

Commit 4c67b83

Browse files
author
José Valim
committed
Check for :name or :id in Logger translator, closes #4073
1 parent 57af576 commit 4c67b83

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

lib/logger/lib/logger/translator.ex

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ defmodule Logger.Translator do
2828
and the default messages translated by Logger.
2929
"""
3030

31+
# The name_or_id checks are required to support old OTP projects.
32+
3133
def translate(min_level, level, kind, message)
3234

3335
def translate(min_level, :error, :format, message) do
@@ -92,8 +94,8 @@ defmodule Logger.Translator do
9294
defp translate_supervisor(min_level,
9395
[supervisor: sup, errorContext: context,
9496
reason: reason,
95-
offender: [{:pid, pid}, {:id, name} | offender]])
96-
when is_pid(pid) and context !== :shutdown do
97+
offender: [{:pid, pid}, {name_or_id, name} | offender]])
98+
when is_pid(pid) and context !== :shutdown and name_or_id in [:name, :id] do
9799
{:ok, ["Child ", inspect(name), " of Supervisor ",
98100
sup_name(sup), ?\s, sup_context(context),
99101
"\n** (exit) ", offender_reason(reason, context),
@@ -105,7 +107,7 @@ defmodule Logger.Translator do
105107
[supervisor: sup, errorContext: context,
106108
reason: reason,
107109
offender: [{:pid, _pid},
108-
{:id, name} | offender]]) do
110+
{name_or_id, name} | offender]]) when name_or_id in [:name, :id] do
109111
{:ok, ["Child ", inspect(name), " of Supervisor ",
110112
sup_name(sup), ?\s, sup_context(context),
111113
"\n** (exit) ", offender_reason(reason, context) |
@@ -127,7 +129,7 @@ defmodule Logger.Translator do
127129
[supervisor: sup, errorContext: context,
128130
reason: reason,
129131
offender: [{:nb_children, n},
130-
{:id, name} | offender]]) do
132+
{name_or_id, name} | offender]]) when name_or_id in [:name, :id] do
131133
{:ok, ["Children ", inspect(name), " of Supervisor ",
132134
sup_name(sup), ?\s, sup_context(context),
133135
"\n** (exit) ", offender_reason(reason, context),
@@ -144,7 +146,7 @@ defmodule Logger.Translator do
144146

145147
defp translate_progress(min_level,
146148
[supervisor: sup,
147-
started: [{:pid, pid}, {:id, name} | started]]) do
149+
started: [{:pid, pid}, {name_or_id, name} | started]]) when name_or_id in [:name, :id] do
148150
{:ok, ["Child ", inspect(name), " of Supervisor ",
149151
sup_name(sup), " started",
150152
"\nPid: ", inspect(pid) |

0 commit comments

Comments
 (0)