SOURCES: heartbeat.init - use functions

[glen]

Author: glen                         Date: Thu Sep 13 12:43:23 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use functions

---- Files affected:
SOURCES:
   heartbeat.init (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/heartbeat.init
diff -u SOURCES/heartbeat.init:1.4 SOURCES/heartbeat.init:1.5
--- SOURCES/heartbeat.init:1.4	Thu Sep 13 14:34:05 2007
+++ SOURCES/heartbeat.init	Thu Sep 13 14:43:18 2007
@@ -71,10 +71,7 @@
 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 @@
 		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 @@
 		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"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/heartbeat.init?r1=1.4&r2=1.5&f=u