diff options
author | Siri Hansen <[email protected]> | 2017-05-19 15:27:46 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2017-05-19 15:27:46 +0200 |
commit | 52ace0d2c565a67e587159780114792c55244312 (patch) | |
tree | 1b21b16cc9c14cf78f4c9ed30f302bd8165a8736 /lib/sasl/src/sasl_report.erl | |
parent | 7ff352ef8a5393a017ce493ba1a1fc3be54be245 (diff) | |
parent | a237426d43b73d931739d9acb86a17513b44ed3e (diff) | |
download | otp-52ace0d2c565a67e587159780114792c55244312.tar.gz otp-52ace0d2c565a67e587159780114792c55244312.tar.bz2 otp-52ace0d2c565a67e587159780114792c55244312.zip |
Merge branch 'master' into jv-gen-server-exits
Diffstat (limited to 'lib/sasl/src/sasl_report.erl')
-rw-r--r-- | lib/sasl/src/sasl_report.erl | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/sasl/src/sasl_report.erl b/lib/sasl/src/sasl_report.erl index 14702b0ad2..eb454155d5 100644 --- a/lib/sasl/src/sasl_report.erl +++ b/lib/sasl/src/sasl_report.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2016. All Rights Reserved. +%% Copyright Ericsson AB 1996-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -68,12 +68,12 @@ write_report2(IO, Fd, Head, progress, Report) -> Format = format_key_val(Report), write_report_action(IO, Fd, Head, "~s", [Format]); write_report2(IO, Fd, Head, crash_report, Report) -> - Depth = get_depth(), + Depth = error_logger:get_format_depth(), Format = proc_lib:format(Report, latin1, Depth), write_report_action(IO, Fd, Head, "~s", [Format]). supervisor_format(Args0) -> - case get_depth() of + case error_logger:get_format_depth() of unlimited -> {" Supervisor: ~p~n" " Context: ~p~n" @@ -102,14 +102,6 @@ format_key_val([{Tag,Data}|Rep]) -> format_key_val(_) -> []. -get_depth() -> - case application:get_env(kernel, error_logger_format_depth) of - {ok, Depth} when is_integer(Depth) -> - max(10, Depth); - undefined -> - unlimited - end. - sup_get(Tag, Report) -> case lists:keysearch(Tag, 1, Report) of {value, {_, Value}} -> |