SOURCES: apache1.init - use more functions - added try-restart action

[qboosh]

Author: qboosh                       Date: Sat Jan 26 13:11:09 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use more functions
- added try-restart action

---- Files affected:
SOURCES:
   apache1.init (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SOURCES/apache1.init
diff -u SOURCES/apache1.init:1.25 SOURCES/apache1.init:1.26
--- SOURCES/apache1.init:1.25	Mon Dec 10 10:42:49 2007
+++ SOURCES/apache1.init	Sat Jan 26 14:11:03 2008
@@ -35,6 +35,7 @@
 
 configtest() {
 	apache -t > /dev/null 2>&1
+	RETVAL=$?
 }
 
 start() {
@@ -79,6 +80,37 @@
 	fi
 }
 
+restart() {
+	configtest
+	if [ $RETVAL -eq 0 ]; then
+		stop
+		start
+	else
+		fail
+		echo >&2 "Configuration file syntax test failed."
+	fi
+}
+
+reload() {
+	sig=${1:-HUP}
+	retnr=${2:-7}
+	if [ -f /var/lock/subsys/apache ]; then
+		msg_reloading apache
+
+		configtest
+		if [ $RETVAL -eq 0 ]; then
+			killproc apache -$sig
+			RETVAL=$?
+		else
+			fail
+			echo >&2 "Configuration file syntax test failed."
+		fi
+	else
+		msg_not_running apache
+		RETVAL=$retnr
+	fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -94,71 +126,29 @@
 	/usr/sbin/apache -S
 	;;
   restart)
-	apache -t > /dev/null 2>&1
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ]; then
-		stop
-		start
-	else
-		fail
-		echo "Configuration file syntax test failed."
-	fi
-
+	restart
 	;;
-  force-reload)
+  try-restart)
   	if [ -f /var/lock/subsys/apache ]; then
-		msg_reloading apache
-
-		configtest
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			killproc apache -HUP
-		else
-			fail
-			echo "Configuration file syntax test failed."
-		fi
+		restart
 	else
 		msg_not_running apache
-		RETVAL=7
 	fi
 	;;
+  force-reload)
+	reload HUP 7
+	;;
   reload|graceful)
-	if [ -f /var/lock/subsys/apache ]; then
-		msg_reloading apache
-
-		configtest
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			killproc apache -USR1
-		else
-			fail
-			echo >&2 "Configuration file syntax test failed."
-		fi
-	else
-		msg_not_running apache
-		RETVAL=7
-	fi
+	reload USR1 7
 	;;
   flush-logs)
-	if [ -f /var/lock/subsys/apache ]; then
-		msg_reloading apache
-
-		configtest
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			killproc apache -HUP
-			RETVAL=$?
-		else
-			fail
-			echo >&2 "Configuration file syntax test failed."
-		fi
-	fi
+	reload HUP 0
 	;;
   configtest)
 	apache -t
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|configtest|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|graceful|configtest|status}"
 	exit 3
 	;;
 esac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache1.init?r1=1.25&r2=1.26&f=u