From 5b9265ad19d6596a8b599eccc64accb67e3c664e Mon Sep 17 00:00:00 2001
From: Magnus Henoch
Date: Mon, 21 Nov 2016 11:48:54 +0000
Subject: Remove vestiges of watchdog support in heart
Hardware watchdog support was removed from heart in R13A, but there were
still some vestiges in the code and the documentation.
- Remove mentions of the HW_WD_DISABLE variable, as it's no longer used.
- Remove the HEART_BEAT_BOOT_DELAY variable, as it was only used for the
hardware watchdog.
---
lib/kernel/doc/src/heart.xml | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
(limited to 'lib/kernel/doc')
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 heart 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 HEART_BEAT_TIMEOUT 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.
+ (defaults to 60 seconds), the system can be rebooted.
An Erlang runtime system to be monitored by a heart program
is to be started with command-line flag -heart (see
also erl(1)).
@@ -51,17 +48,13 @@
or a terminated Erlang runtime system, environment variable
HEART_COMMAND 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 HEART_BEAT_BOOT_DELAY
- seconds later (defaults to 60 seconds).
+ the system does not reboot.
To reboot on Windows, HEART_COMMAND can be
set to heart -shutdown (included in the Erlang delivery)
or to any other suitable program that can activate a reboot.
-
The hardware watchdog is not started under Solaris if
- environment variable HW_WD_DISABLE is set.
-
The environment variables HEART_BEAT_TIMEOUT and
- HEART_BEAT_BOOT_DELAY can be used to configure the heart
- time-outs; they can be set in the operating system shell before Erlang
+
The environment variable HEART_BEAT_TIMEOUT
+ 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: