File 1613-Add-location-info-to-logger-printouts.patch of Package erlang
From a74b9f5ec6e1526f6ab1c09c8dac748232f414e6 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Fri, 8 Nov 2024 17:08:59 +0100
Subject: [PATCH 3/4] Add location info to logger printouts
---
lib/ssl/src/ssl_logger.erl | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/lib/ssl/src/ssl_logger.erl b/lib/ssl/src/ssl_logger.erl
index e65037012c..ab1bf27b2c 100644
--- a/lib/ssl/src/ssl_logger.erl
+++ b/lib/ssl/src/ssl_logger.erl
@@ -47,11 +47,11 @@
log(Level, LogLevel, ReportMap, Meta) ->
case logger:compare_levels(LogLevel, Level) of
lt ->
- logger:log(Level, ReportMap, Meta#{depth => ?DEPTH,
- report_cb => fun ?MODULE:format/1});
+ logger:log(Level, maps:merge(ReportMap, Meta),
+ Meta#{depth => ?DEPTH, report_cb => fun ?MODULE:format/1});
eq ->
- logger:log(Level, ReportMap, Meta#{depth => ?DEPTH,
- report_cb => fun ?MODULE:format/1});
+ logger:log(Level, maps:merge(ReportMap, Meta),
+ Meta#{depth => ?DEPTH, report_cb => fun ?MODULE:format/1});
_ ->
ok
end.
@@ -99,11 +99,15 @@ format(#{alert := Alert, alerter := ignored} = Report) ->
%% Happens in DTLS
{Fmt, Args} = ssl_alert:own_alert_format(ProtocolName, Role, StateName, Alert),
{"~s " ++ Fmt, ["Ignored alert to mitigate DoS attacks", Args]};
+format(#{description := Desc, reason := Reason, file := Mod, line := Line}) ->
+ {"~12s ~p~n"
+ "~12s ~p~n"
+ "~12s ~s:~w~n",
+ ["Description:", Desc, "Reason:", Reason, "Location:", Mod, Line]
+ };
format(#{description := Desc, reason := Reason}) ->
- {"~12s ~p"
- "~n"
- "~12s ~p"
- "~n",
+ {"~12s ~p~n"
+ "~12s ~p~n",
["Description:", Desc, "Reason:", Reason]
}.
--
2.43.0