diff options
| author | Siri Hansen <[email protected]> | 2015-12-09 11:48:08 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2015-12-09 11:48:08 +0100 |
| commit | 9d80569b209d37f711ca55c4673d8dd8fbf614fa (patch) | |
| tree | b4ca40f3a7dec82a0da440d15050432d38deb7c8 /lib/common_test/src/ct_conn_log_h.erl | |
| parent | 8f91fc9576aa4abadf7e20e5aaabec1b37832145 (diff) | |
| parent | 976214f8d738d4852348496df79f84264d899aba (diff) | |
| download | otp-9d80569b209d37f711ca55c4673d8dd8fbf614fa.tar.gz otp-9d80569b209d37f711ca55c4673d8dd8fbf614fa.tar.bz2 otp-9d80569b209d37f711ca55c4673d8dd8fbf614fa.zip | |
Merge branch 'siri/ct_netconfc/slow-down/OTP-13007' into maint
* siri/ct_netconfc/slow-down/OTP-13007:
Extended table_trans timer in order to handle big data on slow machines
Don't log headings without content
Speed up receive of many small packages
Conflicts:
lib/common_test/src/ct_conn_log_h.erl
Diffstat (limited to 'lib/common_test/src/ct_conn_log_h.erl')
| -rw-r--r-- | lib/common_test/src/ct_conn_log_h.erl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl index 5239ec1ff8..f7615fdc14 100644 --- a/lib/common_test/src/ct_conn_log_h.erl +++ b/lib/common_test/src/ct_conn_log_h.erl @@ -116,9 +116,14 @@ write_report(Time,#conn_log{module=ConnMod}=Info,Data,GL,State) -> {silent,_} -> ok; {LogType,Fd} -> - io:format(Fd,"~n~ts~ts~ts",[format_head(ConnMod,LogType,Time), - format_title(LogType,Info), - format_data(ConnMod,LogType,Data)]) + case format_data(ConnMod,LogType,Data) of + [] -> + ok; + FormattedData -> + io:format(Fd,"~n~ts~ts~ts",[format_head(ConnMod,LogType,Time), + format_title(LogType,Info), + FormattedData]) + end end. write_error(Time,#conn_log{module=ConnMod}=Info,Report,GL,State) -> |