aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-09-07 16:57:30 +0200
committerAnders Svensson <[email protected]>2015-09-07 17:54:27 +0200
commitf616bf9f03feb8d9601a4c6ece552e13ec492fb8 (patch)
treeb87c5c819e073780e3ce572dfc47dd5b4f42cb72
parent8b2c875cfd6a12d3dc9ccd9198d1f6123dee8a7f (diff)
downloadotp-f616bf9f03feb8d9601a4c6ece552e13ec492fb8.tar.gz
otp-f616bf9f03feb8d9601a4c6ece552e13ec492fb8.tar.bz2
otp-f616bf9f03feb8d9601a4c6ece552e13ec492fb8.zip
Fix watchdog function_clause
Commit 4f365c07 introduced the error on set_watchdog/2, as a consequence of timeout/1 returning stop, which only happens with accepting transports with {restrict_connections, false}.
-rw-r--r--lib/diameter/src/base/diameter_watchdog.erl8
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)}.