diff options
author | Anders Svensson <[email protected]> | 2018-06-12 17:20:41 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2018-06-12 17:20:41 +0200 |
commit | 70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67 (patch) | |
tree | 1a884e97936ea51d4c7ed8ba974d8884068a8452 /lib/diameter/src/base/diameter_lib.erl | |
parent | b9289f8cc3a97b22b7bfdb2acfef1dc5aec6893e (diff) | |
parent | da952eb9c08d208dfeef4c78b087486f8489fbe8 (diff) | |
download | otp-70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67.tar.gz otp-70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67.tar.bz2 otp-70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67.zip |
Merge branch 'anders/diameter/21.0/OTP-15110'
* anders/diameter/21.0/OTP-15110:
Make diameter_app_SUITE fail more usefully
Simplify app-file generation
Match in diameter_app_SUITE to identify an unexpected path
Don't use deprecated ssl:ssl_accept/1-3
Don't use deprecated erlang:get_stacktrace/0
Diffstat (limited to 'lib/diameter/src/base/diameter_lib.erl')
-rw-r--r-- | lib/diameter/src/base/diameter_lib.erl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl index 1c1ea42cb5..edd9d5a4ce 100644 --- a/lib/diameter/src/base/diameter_lib.erl +++ b/lib/diameter/src/base/diameter_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2017. All Rights Reserved. +%% Copyright Ericsson AB 2010-2018. 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. @@ -33,7 +33,7 @@ time/1, eval/1, eval_name/1, - get_stacktrace/0, + stacktrace/1, ipaddr/1, spawn_opts/2, wait/1, @@ -42,16 +42,13 @@ log/4]). %% --------------------------------------------------------------------------- -%% # get_stacktrace/0 +%% # stacktrace/1 %% --------------------------------------------------------------------------- %% Return a stacktrace with a leading, potentially large, argument -%% list replaced by an arity. Trace on stacktrace/0 to see the +%% list replaced by an arity. Trace on stacktrace/1 to see the %% original. -get_stacktrace() -> - stacktrace(erlang:get_stacktrace()). - stacktrace([{M,F,A,L} | T]) when is_list(A) -> [{M, F, length(A), L} | T]; stacktrace(L) -> @@ -268,8 +265,8 @@ ipaddr(Addr) -> try ip(Addr) catch - error: _ -> - erlang:error({invalid_address, erlang:get_stacktrace()}) + error: _: Stack -> + erlang:error({invalid_address, Stack}) end. %% Already a tuple: ensure non-negative integers of the right size. |