aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/heart.erl
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-12-19 17:31:14 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-12-19 17:31:14 +0100
commit450e67573f4f0e9913d6a73409ea1fe256a406d3 (patch)
treed9ac51ef740d15b346cd6acdcb536bda5c68c15a /lib/kernel/src/heart.erl
parentc2e497d888456e7720bd3d4123694c444ef9072b (diff)
parent5b9265ad19d6596a8b599eccc64accb67e3c664e (diff)
downloadotp-450e67573f4f0e9913d6a73409ea1fe256a406d3.tar.gz
otp-450e67573f4f0e9913d6a73409ea1fe256a406d3.tar.bz2
otp-450e67573f4f0e9913d6a73409ea1fe256a406d3.zip
Merge branch 'legoscia/remove-watchdog-vestiges/PR-1255/OTP-14112' into maint
* legoscia/remove-watchdog-vestiges/PR-1255/OTP-14112: Remove vestiges of watchdog support in heart
Diffstat (limited to 'lib/kernel/src/heart.erl')
-rw-r--r--lib/kernel/src/heart.erl15
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/kernel/src/heart.erl b/lib/kernel/src/heart.erl
index eea78aabdf..8fa48d56fb 100644
--- a/lib/kernel/src/heart.erl
+++ b/lib/kernel/src/heart.erl
@@ -198,16 +198,11 @@ start_portprogram() ->
end.
get_heart_timeouts() ->
- HeartOpts = case os:getenv("HEART_BEAT_TIMEOUT") of
- false -> "";
- H when is_list(H) ->
- "-ht " ++ H
- end,
- HeartOpts ++ case os:getenv("HEART_BEAT_BOOT_DELAY") of
- false -> "";
- W when is_list(W) ->
- " -wt " ++ W
- end.
+ case os:getenv("HEART_BEAT_TIMEOUT") of
+ false -> "";
+ H when is_list(H) ->
+ "-ht " ++ H
+ end.
check_start_heart() ->
case init:get_argument(heart) of