@@ -28,6 +28,8 @@ defmodule Logger.Translator do
28
28
and the default messages translated by Logger.
29
29
"""
30
30
31
+ # The name_or_id checks are required to support old OTP projects.
32
+
31
33
def translate ( min_level , level , kind , message )
32
34
33
35
def translate ( min_level , :error , :format , message ) do
@@ -92,8 +94,8 @@ defmodule Logger.Translator do
92
94
defp translate_supervisor ( min_level ,
93
95
[ supervisor: sup , errorContext: context ,
94
96
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
97
99
{ :ok , [ "Child " , inspect ( name ) , " of Supervisor " ,
98
100
sup_name ( sup ) , ?\s , sup_context ( context ) ,
99
101
"\n ** (exit) " , offender_reason ( reason , context ) ,
@@ -105,7 +107,7 @@ defmodule Logger.Translator do
105
107
[ supervisor: sup , errorContext: context ,
106
108
reason: reason ,
107
109
offender: [ { :pid , _pid } ,
108
- { :id , name } | offender ] ] ) do
110
+ { name_or_id , name } | offender ] ] ) when name_or_id in [ :name , :id ] do
109
111
{ :ok , [ "Child " , inspect ( name ) , " of Supervisor " ,
110
112
sup_name ( sup ) , ?\s , sup_context ( context ) ,
111
113
"\n ** (exit) " , offender_reason ( reason , context ) |
@@ -127,7 +129,7 @@ defmodule Logger.Translator do
127
129
[ supervisor: sup , errorContext: context ,
128
130
reason: reason ,
129
131
offender: [ { :nb_children , n } ,
130
- { :id , name } | offender ] ] ) do
132
+ { name_or_id , name } | offender ] ] ) when name_or_id in [ :name , :id ] do
131
133
{ :ok , [ "Children " , inspect ( name ) , " of Supervisor " ,
132
134
sup_name ( sup ) , ?\s , sup_context ( context ) ,
133
135
"\n ** (exit) " , offender_reason ( reason , context ) ,
@@ -144,7 +146,7 @@ defmodule Logger.Translator do
144
146
145
147
defp translate_progress ( min_level ,
146
148
[ 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
148
150
{ :ok , [ "Child " , inspect ( name ) , " of Supervisor " ,
149
151
sup_name ( sup ) , " started" ,
150
152
"\n Pid: " , inspect ( pid ) |
0 commit comments