diff options
| author | Siri Hansen <[email protected]> | 2019-01-21 14:46:33 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-01-21 14:46:33 +0100 |
| commit | 9c8075413728e3be373d7dff2a7168b3983e0be3 (patch) | |
| tree | 35a3ed275f2ea6f333f5be903e39ddbe6c5a9700 /erts/preloaded/src/init.erl | |
| parent | 88cc8d25abe9e6fb7708a6ea673aa0637a28860a (diff) | |
| parent | a8364425a7190b65cd33e58ac3c155a77c462b74 (diff) | |
| download | otp-9c8075413728e3be373d7dff2a7168b3983e0be3.tar.gz otp-9c8075413728e3be373d7dff2a7168b3983e0be3.tar.bz2 otp-9c8075413728e3be373d7dff2a7168b3983e0be3.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/preloaded/src/init.erl')
| -rw-r--r-- | erts/preloaded/src/init.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index d8f5c9a945..54cbd96710 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -479,7 +479,7 @@ do_handle_msg(Msg,State) -> X -> case whereis(user) of undefined -> - Time = erlang:monotonic_time(microsecond), + Time = erlang:system_time(microsecond), catch logger ! {log, info, "init got unexpected: ~p", [X], #{pid=>self(), gl=>self(), |