diff options
| author | Anders Svensson <[email protected]> | 2012-11-05 11:28:50 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-11-05 11:28:50 +0100 |
| commit | d221d8b27722611a8fa3e8e469da2f3e0b0bcb7b (patch) | |
| tree | 39f240ea03a7a59d063e8a99a49e7e07d0e09681 /lib/diameter/src | |
| parent | 23f067e0b9d03d966dbb31c35984b1a811f6b8a7 (diff) | |
| parent | 1057d8c7f1bc386e4369c39574cfca97751d9a65 (diff) | |
| download | otp-d221d8b27722611a8fa3e8e469da2f3e0b0bcb7b.tar.gz otp-d221d8b27722611a8fa3e8e469da2f3e0b0bcb7b.tar.bz2 otp-d221d8b27722611a8fa3e8e469da2f3e0b0bcb7b.zip | |
Merge branch 'anders/diameter/watchdog_timeout/OTP-10444' into maint
* anders/diameter/watchdog_timeout/OTP-10444:
Exit peer_fsm with {shutdown, watchdog_timeout}, not shutdown
Diffstat (limited to 'lib/diameter/src')
| -rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index d7474e5c56..53f5f42396 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -555,7 +555,7 @@ timeout(#watchdog{status = T, = S) when T == suspect; T == reopen, P, N < 0 -> - exit(TPid, shutdown), + exit(TPid, {shutdown, watchdog_timeout}), close(S), S#watchdog{status = down}; |