diff options
author | Siri Hansen <[email protected]> | 2019-02-22 14:26:07 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2019-02-22 14:26:07 +0100 |
commit | 00678f41aaa14191dc333596fee33075ce515e24 (patch) | |
tree | a0b89d879ba052248c54f454dfd44ac33b0527c2 /erts/preloaded/src/init.erl | |
parent | 9fc7abf9e8741552d11a64470b3c489120d069b1 (diff) | |
download | otp-00678f41aaa14191dc333596fee33075ce515e24.tar.gz otp-00678f41aaa14191dc333596fee33075ce515e24.tar.bz2 otp-00678f41aaa14191dc333596fee33075ce515e24.zip |
[logger] Change timestamp from erlang:system_time to os:system_time
This is to align the timestamps with external logs.
Diffstat (limited to 'erts/preloaded/src/init.erl')
-rw-r--r-- | erts/preloaded/src/init.erl | 7 |
1 files changed, 5 insertions, 2 deletions
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, |