diff options
| author | Siri Hansen <siri@erlang.org> | 2019-03-04 12:07:02 +0100 |
|---|---|---|
| committer | Siri Hansen <siri@erlang.org> | 2019-03-04 12:07:02 +0100 |
| commit | 4d72eedc0d3573e9709b8f2c8773429e85529d7f (patch) | |
| tree | 1205a9db5d6dda3e1db50bdd221d9bb802089647 /erts/preloaded/src/init.erl | |
| parent | 2a527454677dc0216c5d47ad580aad2e913e1b9a (diff) | |
| parent | 6d795779f770deb1829e1df2fa4a75f41e602d35 (diff) | |
| download | erlang-4d72eedc0d3573e9709b8f2c8773429e85529d7f.tar.gz | |
Merge branch 'maint'
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 54cbd96710..5ea67347ec 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -477,13 +477,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, |