diff options
| author | Peter Andersson <[email protected]> | 2016-06-14 09:37:10 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2016-06-14 09:37:10 +0200 |
| commit | d08201b22997975bccae635bf47ddec6b585c5a8 (patch) | |
| tree | 6ba20967fae50fc920f2ab2c48ad8ac61b464cbf /lib/common_test/src | |
| parent | a1d506d8bf8978656d76bff884adc329d2f4da3b (diff) | |
| parent | e3fd5673dfb8542fe34ec490c4c788c21b20ef69 (diff) | |
| download | otp-d08201b22997975bccae635bf47ddec6b585c5a8.tar.gz otp-d08201b22997975bccae635bf47ddec6b585c5a8.tar.bz2 otp-d08201b22997975bccae635bf47ddec6b585c5a8.zip | |
Merge branch 'peppe/common_test/OTP-13615'
* peppe/common_test/OTP-13615:
Fix problem with incorrect type of timestamps
OTP-13615
Diffstat (limited to 'lib/common_test/src')
| -rw-r--r-- | lib/common_test/src/cth_log_redirect.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl index 33a3813a16..6d77d7ee9e 100644 --- a/lib/common_test/src/cth_log_redirect.erl +++ b/lib/common_test/src/cth_log_redirect.erl @@ -127,7 +127,7 @@ handle_event(Event, #eh_state{log_func = LogFunc} = State) -> _Else -> {ok, ErrLogType} = application:get_env(sasl, errlog_type), SReport = sasl_report:format_report(group_leader(), ErrLogType, - tag_event(Event)), + tag_event(Event, local)), if is_list(SReport) -> SaslHeader = format_header(State), case LogFunc of @@ -142,8 +142,9 @@ handle_event(Event, #eh_state{log_func = LogFunc} = State) -> ignore end end, + %% note that error_logger (unlike sasl) expects UTC time EReport = error_logger_tty_h:write_event( - tag_event(Event),io_lib), + tag_event(Event, utc), io_lib), if is_list(EReport) -> ErrHeader = format_header(State), case LogFunc of @@ -220,7 +221,9 @@ terminate(_) -> terminate(_Arg, _State) -> ok. -tag_event(Event) -> +tag_event(Event, utc) -> + {calendar:universal_time(), Event}; +tag_event(Event, _) -> {calendar:local_time(), Event}. set_curr_func(CurrFunc, Config) -> |