diff options
| author | Erlang/OTP <[email protected]> | 2015-12-20 16:29:08 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-12-20 16:29:08 +0100 |
| commit | 1ad51efe836b84522d7f1b1790dcfa595219f57c (patch) | |
| tree | ab8db6a4a5d995f9f275559f825c741ab689e6fa /lib/diameter/src/base | |
| parent | ea94882ee5ca148564e6940fde6d17e0417de9db (diff) | |
| parent | 3a3e91b3592c911fc251c496421135a1a116fa00 (diff) | |
| download | otp-1ad51efe836b84522d7f1b1790dcfa595219f57c.tar.gz otp-1ad51efe836b84522d7f1b1790dcfa595219f57c.tar.bz2 otp-1ad51efe836b84522d7f1b1790dcfa595219f57c.zip | |
Merge branch 'anders/diameter/17/watchdog/OTP-12969' into maint-17
* anders/diameter/17/watchdog/OTP-12969:
Fix watchdog function_clause
Diffstat (limited to 'lib/diameter/src/base')
| -rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index 885dc6c801..26bca7a5bc 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -539,13 +539,13 @@ set_watchdog(#watchdog{tref = undefined} = S) -> %% Timer already set: start at new one only at expiry. set_watchdog(#watchdog{} = S) -> - S#watchdog{tref = now()}; - -set_watchdog(stop = No) -> - No. + S#watchdog{tref = now()}. %% set_watchdog/2 +set_watchdog(_, stop = No) -> + No; + set_watchdog(Ms, #watchdog{tw = TwInit} = S) -> S#watchdog{tref = erlang:start_timer(tw(TwInit, Ms), self(), tw)}. |