SOURCES: apache1.init - check config before doing apache restart

[glen]

Author: glen                         Date: Wed Oct 19 14:52:56 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- check config before doing apache restart

---- Files affected:
SOURCES:
   apache1.init (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SOURCES/apache1.init
diff -u SOURCES/apache1.init:1.15 SOURCES/apache1.init:1.16
--- SOURCES/apache1.init:1.15	Sun Jul 10 11:24:39 2005
+++ SOURCES/apache1.init	Wed Oct 19 16:52:51 2005
@@ -64,9 +64,18 @@
 	/usr/sbin/apache -S
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	apache -t > /dev/null 2>&1
+	RETVAL=$?
+	if [ $RETVAL -eq 0 ]; then
+		$0 stop
+		RETVAL=$((RETVAL + $?))
+		$0 start
+		RETVAL=$((RETVAL + $?))
+	else
+		fail
+		echo "Configuration file syntax test failed."
+	fi
+
 	;;
   reload|force-reload)
   	if [ -f /var/lock/subsys/apache ]; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache1.init?r1=1.15&r2=1.16&f=u