stdlib: Use utc time as base in error logger

   * All computer time should be in utc and
     converted to local when needed

   * Previous conversion used the depcrated
     calendar:local_time_to_universal_time/1

1 files changed, 8 insertions, 13 deletions

diff --git a/lib/stdlib/src/error_logger_tty_h.erl b/lib/stdlib/src/error_logger_tty_h.erl
index fa13fbb2bd..c7b565bd06 100644
--- a/lib/stdlib/src/error_logger_tty_h.erl
+++ b/lib/stdlib/src/error_logger_tty_h.erl
@@ -97,7 +97,7 @@ set_group_leader() ->
     end.
 
 tag_event(Event) ->    
-    {erlang:localtime(), Event}.
+    {erlang:universaltime(), Event}.
 
 write_events(Events,IOMod) -> write_events1(lists:reverse(Events),IOMod).
 
@@ -162,23 +162,18 @@ write_event({_Time, _Error},_IOMod) ->
 
 maybe_utc(Time) ->
     UTC = case application:get_env(sasl, utc_log) of
-              {ok, Val} ->
-                  Val;
+              {ok, Val} -> Val;
               undefined ->
                   %% Backwards compatible:
                   case application:get_env(stdlib, utc_log) of
-                      {ok, Val} ->
-                          Val;
-                      undefined ->
-                          false
+                      {ok, Val} -> Val;
+                      undefined -> false
                   end
           end,
-    if
-        UTC =:= true ->
-            {utc, calendar:local_time_to_universal_time(Time)};
-        true -> 
-            Time
-    end.
+    maybe_utc(Time, UTC).
+
+maybe_utc(Time, true) -> {utc, Time};
+maybe_utc(Time, _) -> calendar:universal_time_to_local_time(Time).
 
 format(IOMod, String)       -> format(IOMod, String, []).
 format(io_lib, String, Args) -> io_lib:format(String, Args);