Merge branch 'richcarl/error_logger_tty-cleanup/PR-1256/OTP-14068'

* richcarl/error_logger_tty-cleanup/PR-1256/OTP-14068:
  Write node info before log message body, not after
  Eliminate some code duplication

2 files changed, 55 insertions, 60 deletions

diff --git a/lib/stdlib/src/error_logger_file_h.erl b/lib/stdlib/src/error_logger_file_h.erl
index 665685d3ee..0b262de3ab 100644
--- a/lib/stdlib/src/error_logger_file_h.erl
+++ b/lib/stdlib/src/error_logger_file_h.erl
@@ -116,8 +116,8 @@ write_event(#st{fd=Fd}=State, Event) ->
 	ignore ->
 	    ok;
 	{Head,Pid,FormatList} ->
-	    Time = maybe_utc(erlang:universaltime()),
-	    Header = write_time(Time, Head),
+	    Time = erlang:universaltime(),
+	    Header = header(Time, Head),
 	    Body = format_body(State, FormatList),
 	    AtNode = if
 			 node(Pid) =/= node() ->
@@ -125,7 +125,7 @@ write_event(#st{fd=Fd}=State, Event) ->
 			 true ->
 			     []
 		     end,
-	    io:put_chars(Fd, [Header,Body,AtNode])
+	    io:put_chars(Fd, [Header,AtNode,Body])
     end.
 
 format_body(State, [{Format,Args}|T]) ->
@@ -172,21 +172,6 @@ parse_event({warning_report, _GL, {Pid, std_warning, Args}}) ->
     {"WARNING REPORT",Pid,format_term(Args)};
 parse_event(_) -> ignore.
 
-maybe_utc(Time) ->
-    UTC = case application:get_env(sasl, utc_log) of
-              {ok, Val} -> Val;
-              undefined ->
-                  %% Backwards compatible:
-                  case application:get_env(stdlib, utc_log) of
-                      {ok, Val} -> Val;
-                      undefined -> false
-                  end
-          end,
-    maybe_utc(Time, UTC).
-
-maybe_utc(Time, true) -> {utc, Time};
-maybe_utc(Time, _) -> {local, calendar:universal_time_to_local_time(Time)}.
-
 format_term(Term) when is_list(Term) ->
     case string_p(Term) of
 	true ->
@@ -227,17 +212,33 @@ string_p1([H|T]) when is_list(H) ->
 string_p1([]) -> true;
 string_p1(_) ->  false.
 
-write_time({utc,{{Y,Mo,D},{H,Mi,S}}}, Type) ->
-    io_lib:format("~n=~s==== ~p-~s-~p::~s:~s:~s UTC ===~n",
-		  [Type,D,month(Mo),Y,t(H),t(Mi),t(S)]);
-write_time({local, {{Y,Mo,D},{H,Mi,S}}}, Type) ->
-    io_lib:format("~n=~s==== ~p-~s-~p::~s:~s:~s ===~n",
-		  [Type,D,month(Mo),Y,t(H),t(Mi),t(S)]).
+get_utc_config() ->
+    %% SASL utc_log configuration overrides stdlib config
+    %% in order to have uniform timestamps in log messages
+    case application:get_env(sasl, utc_log) of
+        {ok, Val} -> Val;
+        undefined ->
+            case application:get_env(stdlib, utc_log) of
+                {ok, Val} -> Val;
+                undefined -> false
+            end
+    end.
+
+header(Time, Title) ->
+    case get_utc_config() of
+        true ->
+            header(Time, Title, "UTC ");
+        _ ->
+            header(calendar:universal_time_to_local_time(Time), Title, "")
+    end.
+
+header({{Y,Mo,D},{H,Mi,S}}, Title, UTC) ->
+    io_lib:format("~n=~s==== ~p-~s-~p::~s:~s:~s ~s===~n",
+                  [Title,D,month(Mo),Y,t(H),t(Mi),t(S),UTC]).
 
 t(X) when is_integer(X) ->
-    t1(integer_to_list(X));
-t(_) ->
-    "".
+    t1(integer_to_list(X)).
+
 t1([X]) -> [$0,X];
 t1(X)   -> X.
 
@@ -253,5 +254,3 @@ month(9) -> "Sep";
 month(10) -> "Oct";
 month(11) -> "Nov";
 month(12) -> "Dec".
-
-
diff --git a/lib/stdlib/src/error_logger_tty_h.erl b/lib/stdlib/src/error_logger_tty_h.erl
index cb22a8c0b6..2f2fd65252 100644
--- a/lib/stdlib/src/error_logger_tty_h.erl
+++ b/lib/stdlib/src/error_logger_tty_h.erl
@@ -128,13 +128,12 @@ write_events(State, [Ev|Es]) ->
 write_events(_State, []) ->
     ok.
 
-do_write_event(State, {Time0, Event}) ->
+do_write_event(State, {Time, Event}) ->
     case parse_event(Event) of
 	ignore ->
 	    ok;
-	{Head,Pid,FormatList} ->
-	    Time = maybe_utc(Time0),
-	    Header = write_time(Time, Head),
+	{Title,Pid,FormatList} ->
+	    Header = header(Time, Title),
 	    Body = format_body(State, FormatList),
 	    AtNode = if
 			 node(Pid) =/= node() ->
@@ -142,7 +141,7 @@ do_write_event(State, {Time0, Event}) ->
 			 true ->
 			     []
 		     end,
-	    Str = [Header,Body,AtNode],
+	    Str = [Header,AtNode,Body],
 	    case State#st.io_mod of
 		io_lib ->
 		    Str;
@@ -197,21 +196,6 @@ parse_event({warning_report, _GL, {Pid, std_warning, Args}}) ->
     {"WARNING REPORT",Pid,format_term(Args)};
 parse_event(_) -> ignore.
 
-maybe_utc(Time) ->
-    UTC = case application:get_env(sasl, utc_log) of
-              {ok, Val} -> Val;
-              undefined ->
-                  %% Backwards compatible:
-                  case application:get_env(stdlib, utc_log) of
-                      {ok, Val} -> Val;
-                      undefined -> false
-                  end
-          end,
-    maybe_utc(Time, UTC).
-
-maybe_utc(Time, true) -> {utc, Time};
-maybe_utc(Time, _) -> {local, calendar:universal_time_to_local_time(Time)}.
-
 format_term(Term) when is_list(Term) ->
     case string_p(Term) of
 	true ->
@@ -255,12 +239,29 @@ string_p1([H|T]) when is_list(H) ->
 string_p1([]) -> true;
 string_p1(_) ->  false.
 
-write_time({utc,{{Y,Mo,D},{H,Mi,S}}},Type) ->
-    io_lib:format("~n=~s==== ~p-~s-~p::~s:~s:~s UTC ===~n",
-		  [Type,D,month(Mo),Y,t(H),t(Mi),t(S)]);
-write_time({local, {{Y,Mo,D},{H,Mi,S}}},Type) ->
-    io_lib:format("~n=~s==== ~p-~s-~p::~s:~s:~s ===~n",
-		  [Type,D,month(Mo),Y,t(H),t(Mi),t(S)]).
+get_utc_config() ->
+    %% SASL utc_log configuration overrides stdlib config
+    %% in order to have uniform timestamps in log messages
+    case application:get_env(sasl, utc_log) of
+        {ok, Val} -> Val;
+        undefined ->
+            case application:get_env(stdlib, utc_log) of
+                {ok, Val} -> Val;
+                undefined -> false
+            end
+    end.
+
+header(Time, Title) ->
+    case get_utc_config() of
+        true ->
+            header(Time, Title, "UTC ");
+        _ ->
+            header(calendar:universal_time_to_local_time(Time), Title, "")
+    end.
+
+header({{Y,Mo,D},{H,Mi,S}}, Title, UTC) ->
+    io_lib:format("~n=~s==== ~p-~s-~p::~s:~s:~s ~s===~n",
+                 [Title,D,month(Mo),Y,t(H),t(Mi),t(S),UTC]).
 
 t(X) when is_integer(X) ->
     t1(integer_to_list(X));
@@ -281,8 +282,3 @@ month(9) -> "Sep";
 month(10) -> "Oct";
 month(11) -> "Nov";
 month(12) -> "Dec".
-
-
-
-
-