diff options
| author | Anders Svensson <[email protected]> | 2015-09-14 23:41:52 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-09-14 23:41:52 +0200 |
| commit | 33666085c11ffdd0c931042dd742f1b1fae35543 (patch) | |
| tree | ef181ffd91b540eeeac896577a0581304d5e3b5c /lib | |
| parent | a8d17f7e69e853d1bc858e72dc9daf6beed30f19 (diff) | |
| parent | f616bf9f03feb8d9601a4c6ece552e13ec492fb8 (diff) | |
| download | otp-33666085c11ffdd0c931042dd742f1b1fae35543.tar.gz otp-33666085c11ffdd0c931042dd742f1b1fae35543.tar.bz2 otp-33666085c11ffdd0c931042dd742f1b1fae35543.zip | |
Merge branch 'anders/diameter/watchdog/OTP-12969' into maint
* anders/diameter/watchdog/OTP-12969:
Fix watchdog function_clause
Diffstat (limited to 'lib')
| -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 3c0d8f6f6e..ea8b2fdb0e 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -541,13 +541,13 @@ set_watchdog(#watchdog{tref = undefined} = S) -> %% Timer already set: start at new one only at expiry. set_watchdog(#watchdog{} = S) -> - S#watchdog{tref = diameter_lib:now()}; - -set_watchdog(stop = No) -> - No. + S#watchdog{tref = diameter_lib: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)}. |