From 00678f41aaa14191dc333596fee33075ce515e24 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Fri, 22 Feb 2019 14:26:07 +0100
Subject: [logger] Change timestamp from erlang:system_time to os:system_time

This is to align the timestamps with external logs.
---
 erts/preloaded/src/init.erl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'erts/preloaded/src/init.erl')

diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index bdcdf72c2f..86b4f35ae5 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -483,13 +483,16 @@ do_handle_msg(Msg,State) ->
 	{From, {ensure_loaded, _}} ->
 	    From ! {init, not_allowed};
 	X ->
+            %% This is equal to calling logger:info/3 which we don't
+            %% want to do from the init process, at least not during
+            %% system boot. We don't want to call logger:timestamp()
+            %% either.
 	    case whereis(user) of
 		undefined ->
-		    Time = erlang:system_time(microsecond),
                     catch logger ! {log, info, "init got unexpected: ~p", [X],
                                     #{pid=>self(),
                                       gl=>self(),
-                                      time=>Time,
+                                      time=>os:system_time(microsecond),
                                       error_logger=>#{tag=>info_msg}}};
 		User ->
 		    User ! X,
-- 
cgit v1.2.3