diff options
author | Erlang/OTP <[email protected]> | 2015-08-13 12:34:00 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2015-08-13 12:34:00 +0200 |
commit | 8929f163480085e2d2f2ab9eb14cf83080717da5 (patch) | |
tree | 1c9bf2fb068239f72cbd0b5e7451c3e0ba60d7c8 /lib/diameter/src/base/diameter_peer_fsm.erl | |
parent | 12002949e5435d19c750fe2cd8e897b4059f875a (diff) | |
parent | 16aaa29b7ce40596520d563b6f4a8e0aeba7b085 (diff) | |
download | otp-8929f163480085e2d2f2ab9eb14cf83080717da5.tar.gz otp-8929f163480085e2d2f2ab9eb14cf83080717da5.tar.bz2 otp-8929f163480085e2d2f2ab9eb14cf83080717da5.zip |
Merge branch 'anders/diameter/decode/OTP-12871' into maint-17
* anders/diameter/decode/OTP-12871:
Don't traverse errors list unnecessarily when detecting missing AVPs
Don't flag AVP as missing as a consequence of decode error
Correct inaccurate doc
Truncate potentially large terms passed to diameter_lib:log/4
Diffstat (limited to 'lib/diameter/src/base/diameter_peer_fsm.erl')
-rw-r--r-- | lib/diameter/src/base/diameter_peer_fsm.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl index 2255d0a76b..a9ee4940a3 100644 --- a/lib/diameter/src/base/diameter_peer_fsm.erl +++ b/lib/diameter/src/base/diameter_peer_fsm.erl @@ -319,7 +319,7 @@ handle_info(T, #state{} = State) -> ?LOG(stop, Reason), {stop, {shutdown, Reason}, State}; stop -> - ?LOG(stop, T), + ?LOG(stop, truncate(T)), {stop, {shutdown, T}, State} catch exit: {diameter_codec, encode, T} = Reason -> @@ -355,6 +355,11 @@ code_change(_, State, _) -> %% --------------------------------------------------------------------------- %% --------------------------------------------------------------------------- +truncate({'DOWN' = T, _, process, Pid, _}) -> + {T, Pid}; +truncate(T) -> + T. + putr(Key, Val) -> put({?MODULE, Key}, Val). |