From: Elan Ruusamäe Date: Thu, 13 Sep 2007 12:43:18 +0000 (+0000) Subject: - use functions X-Git-Tag: auto/ac/heartbeat-2_1_2-1~4 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=4b820c0246d75d1348446eeec2b79b70ffa7a979;p=packages%2Fheartbeat.git - use functions Changed files: heartbeat.init -> 1.5 --- diff --git a/heartbeat.init b/heartbeat.init index d22ff20..5cd4102 100644 --- a/heartbeat.init +++ b/heartbeat.init @@ -71,10 +71,7 @@ if [ -f $HA_DIR/resource.d/startstop ]; then fi } -RETVAL=0 - -case "$1" in - start) +start() { $HA_BIN/ha_logd -s 2>&1 >/dev/null if [ $? -ne 0 ]; then msg_starting ha_logd @@ -102,16 +99,9 @@ case "$1" in RETVAL=$? RunStartStop post-start $RETVAL fi - ;; - standby) - StandbyHA - RETVAL=$? - ;; - status) - $HA_BIN/heartbeat -s - RETVAL=$? - ;; - stop) +} + +stop() { RunStartStop "pre-stop" $HA_BIN/heartbeat -s 2>&1 >/dev/null if [ $? -eq 0 ]; then @@ -129,10 +119,27 @@ case "$1" in msg_not_running ha_logd fi rm -f /var/lock/subsys/heartbeat 2>/dev/null +} + +RETVAL=0 +case "$1" in + start) + start + ;; + standby) + StandbyHA + RETVAL=$? + ;; + status) + $HA_BIN/heartbeat -s + RETVAL=$? + ;; + stop) + stop ;; restart) - $0 stop - $0 start + stop + start ;; force-reload|reload) msg_reloading "Heartbeat"