diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-12-19 17:31:14 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-12-19 17:31:14 +0100 |
| commit | 450e67573f4f0e9913d6a73409ea1fe256a406d3 (patch) | |
| tree | d9ac51ef740d15b346cd6acdcb536bda5c68c15a /lib/kernel/doc/src | |
| parent | c2e497d888456e7720bd3d4123694c444ef9072b (diff) | |
| parent | 5b9265ad19d6596a8b599eccc64accb67e3c664e (diff) | |
| download | otp-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/doc/src')
| -rw-r--r-- | lib/kernel/doc/src/heart.xml | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml index 59a046bf4d..5b5b71e521 100644 --- a/lib/kernel/doc/src/heart.xml +++ b/lib/kernel/doc/src/heart.xml @@ -37,10 +37,7 @@ the <c>heart</c> port program is to check that the Erlang runtime system it is supervising is still running. If the port program has not received any heartbeats within <c>HEART_BEAT_TIMEOUT</c> seconds - (defaults to 60 seconds), the system can be rebooted. Also, if - the system is equipped with a hardware watchdog timer and is - running Solaris, the watchdog can be used to supervise the entire - system.</p> + (defaults to 60 seconds), the system can be rebooted.</p> <p>An Erlang runtime system to be monitored by a heart program is to be started with command-line flag <c>-heart</c> (see also <seealso marker="erts:erl"><c>erl(1)</c></seealso>). @@ -51,17 +48,13 @@ or a terminated Erlang runtime system, environment variable <c>HEART_COMMAND</c> must be set before the system is started. If this variable is not set, a warning text is printed but - the system does not reboot. However, if the hardware watchdog is - used, it still triggers a reboot <c>HEART_BEAT_BOOT_DELAY</c> - seconds later (defaults to 60 seconds).</p> + the system does not reboot.</p> <p>To reboot on Windows, <c>HEART_COMMAND</c> can be set to <c>heart -shutdown</c> (included in the Erlang delivery) or to any other suitable program that can activate a reboot.</p> - <p>The hardware watchdog is not started under Solaris if - environment variable <c>HW_WD_DISABLE</c> is set.</p> - <p>The environment variables <c>HEART_BEAT_TIMEOUT</c> and - <c>HEART_BEAT_BOOT_DELAY</c> can be used to configure the heart - time-outs; they can be set in the operating system shell before Erlang + <p>The environment variable <c>HEART_BEAT_TIMEOUT</c> + can be used to configure the heart + time-outs; it can be set in the operating system shell before Erlang is started or be specified at the command line:</p> <pre> % <input>erl -heart -env HEART_BEAT_TIMEOUT 30 ...</input></pre> |