diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-12-19 17:31:24 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-12-19 17:31:24 +0100 |
| commit | fc33532623244ff784c575a72deb68655430a273 (patch) | |
| tree | cfd64c6d44aab6014bda6624864eecc34311a3c0 /lib/kernel/src | |
| parent | cc2a8bc4a21b51bf7370f47ba87a593f341de588 (diff) | |
| parent | 450e67573f4f0e9913d6a73409ea1fe256a406d3 (diff) | |
| download | otp-fc33532623244ff784c575a72deb68655430a273.tar.gz otp-fc33532623244ff784c575a72deb68655430a273.tar.bz2 otp-fc33532623244ff784c575a72deb68655430a273.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/heart.erl | 15 |
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 |