aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-06-11 14:46:26 +0200
committerLukas Larsson <[email protected]>2018-06-11 14:46:26 +0200
commite1d7d2d501bd1d28a3c0962d9230147503e3a1c8 (patch)
tree84621f5e7aed1d393b1158f4e696a6db9f94a1c1
parentc2d0170c32402a7ddb6657be72f5bf5786fa298b (diff)
parentbc50c1e4e0d7deaae19804964760d4ffa1e13cbb (diff)
downloadotp-e1d7d2d501bd1d28a3c0962d9230147503e3a1c8.tar.gz
otp-e1d7d2d501bd1d28a3c0962d9230147503e3a1c8.tar.bz2
otp-e1d7d2d501bd1d28a3c0962d9230147503e3a1c8.zip
Merge branch 'lukas/kernel/logger-config/OTP-13295'
* lukas/kernel/logger-config/OTP-13295: erts: Fix emulator log messages to use erlang:system_time kernel: Add LOGGER_SERVER_TAG to logger_server
-rw-r--r--erts/emulator/beam/utils.c2
-rw-r--r--erts/etc/unix/etp-commands.in1
-rw-r--r--lib/kernel/src/logger_server.erl1
3 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c
index 87709edc15..78d9d5e613 100644
--- a/erts/emulator/beam/utils.c
+++ b/erts/emulator/beam/utils.c
@@ -1946,7 +1946,7 @@ do_allocate_logger_message(Eterm gleader, ErtsMonotonicTime *ts, Eterm *pid,
else
sz += MAP4_SZ /* metadata map w gl w pid*/;
- *ts = ERTS_MONOTONIC_TO_USEC(erts_get_monotonic_time(NULL)) + ERTS_MONOTONIC_OFFSET_USEC;
+ *ts = ERTS_MONOTONIC_TO_USEC(erts_get_monotonic_time(NULL) + erts_get_time_offset());
erts_bld_sint64(NULL, &sz, *ts);
*bp = new_message_buffer(sz);
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index 39e378193a..5b89621733 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -1346,7 +1346,6 @@ define etp-sigq-int
else
if $etp_sig_save_last && *$etp_sig_save_last == $etp_sig
printf " %% <== SAVED_LAST"
- else
end
end
if $etp_sig_next
diff --git a/lib/kernel/src/logger_server.erl b/lib/kernel/src/logger_server.erl
index 47010c9fa5..024b9dfa39 100644
--- a/lib/kernel/src/logger_server.erl
+++ b/lib/kernel/src/logger_server.erl
@@ -125,6 +125,7 @@ update_formatter_config(_HandlerId, FormatterConfig) ->
init([]) ->
process_flag(trap_exit, true),
+ put(?LOGGER_SERVER_TAG,true),
Tid = logger_config:new(?LOGGER_TABLE),
LoggerConfig = maps:merge(default_config(logger),
#{handlers=>[simple]}),