aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-12-14 15:21:36 +0100
committerSiri Hansen <[email protected]>2019-01-16 09:59:24 +0100
commitbbf00a0ef74bbe49b29e800a07c94e4c0b4d01b2 (patch)
tree097c976cb2d7e13a35354deb932ca510df255cbf /erts/preloaded/src
parent72c625bc20a1510a01e7eaa5978f903b45e3e88e (diff)
downloadotp-bbf00a0ef74bbe49b29e800a07c94e4c0b4d01b2.tar.gz
otp-bbf00a0ef74bbe49b29e800a07c94e4c0b4d01b2.tar.bz2
otp-bbf00a0ef74bbe49b29e800a07c94e4c0b4d01b2.zip
Use system_time instead of monotonic_time in log events
Two modules were missed when this was changed before OTP-21.
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/erl_prim_loader.erl2
-rw-r--r--erts/preloaded/src/init.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index ae5f86e017..fefdd34292 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -302,7 +302,7 @@ check_file_result(Func, Target, {error,Reason}) ->
logger ! {log,error,#{label=>{?MODULE,file_error},report=>Report},
#{pid=>self(),
gl=>group_leader(),
- time=>erlang:monotonic_time(microsecond),
+ time=>erlang:system_time(microsecond),
error_logger=>#{tag=>error_report,
type=>std_error}}},
error
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index b4b8b3bf9b..bdcdf72c2f 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -485,7 +485,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(),