From 929ab18ae07bc50ff3f8f3df781ef1d5d1f36b7b Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 26 Jan 2008 13:11:03 +0000
Subject: [PATCH] - use more functions - added try-restart action

Changed files:
    apache1.init -> 1.26
---
 apache1.init | 92 +++++++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 51 deletions(-)

diff --git a/apache1.init b/apache1.init
index ffa6e3d..8b8c697 100644
--- a/apache1.init
+++ b/apache1.init
@@ -35,6 +35,7 @@ fi
 
 configtest() {
 	apache -t > /dev/null 2>&1
+	RETVAL=$?
 }
 
 start() {
@@ -79,6 +80,37 @@ stop() {
 	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 @@ case "$1" in
 	/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
-- 
2.43.0