diff options
author | Anders Svensson <[email protected]> | 2016-03-07 22:07:42 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2016-03-07 22:07:42 +0100 |
commit | 184bc747089398d7fd74aef9bce48b42e8e71464 (patch) | |
tree | 9c8004d6300177cfd2be23dac8afc20f3c821c38 /lib/diameter/src/base/diameter_service.erl | |
parent | f749db7604cd452bace62ed333a3004135409993 (diff) | |
parent | cc4ccfb0756bb563c869d94b630ccfecb571d6c2 (diff) | |
download | otp-184bc747089398d7fd74aef9bce48b42e8e71464.tar.gz otp-184bc747089398d7fd74aef9bce48b42e8e71464.tar.bz2 otp-184bc747089398d7fd74aef9bce48b42e8e71464.zip |
Merge branch 'anders/diameter/retransmission/OTP-13342' into maint
* anders/diameter/retransmission/OTP-13342:
Fix handling of shared peer connections in watchdog state SUSPECT
Remove unnecessary parentheses
Remove dead export
Diffstat (limited to 'lib/diameter/src/base/diameter_service.erl')
-rw-r--r-- | lib/diameter/src/base/diameter_service.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl index 8bfc6daf1b..66c4a7582f 100644 --- a/lib/diameter/src/base/diameter_service.erl +++ b/lib/diameter/src/base/diameter_service.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2015. All Rights Reserved. +%% Copyright Ericsson AB 2010-2016. 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. @@ -488,6 +488,9 @@ transition({service, Pid}, S) -> transition({peer, TPid, Aliases, Caps}, S) -> remote_peer_up(TPid, Aliases, Caps, S), ok; +transition({peer, TPid}, S) -> + remote_peer_down(TPid, S), + ok; %% Remote peer process has died. transition({'DOWN', _, process, TPid, _}, S) -> @@ -1422,8 +1425,9 @@ share_peer(up, Caps, Apps, TPid, #state{options = [_, {_,T} | _], service_name = Svc}) -> notify(T, Svc, {peer, TPid, [A || {_,A} <- Apps], Caps}); -share_peer(_, _, _, _, _) -> - ok. +share_peer(down, _Caps, _Apps, TPid, #state{options = [_, {_,T} | _], + service_name = Svc}) -> + notify(T, Svc, {peer, TPid}). %% --------------------------------------------------------------------------- %% # share_peers/2 |