SOURCES: apache.init - don't hide messages written during configur...

[bszx]

Author: bszx                         Date: Sat Oct 29 15:20:28 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- don't hide messages written during configuration file syntax check

---- Files affected:
SOURCES:
   apache.init (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.44 SOURCES/apache.init:1.45
--- SOURCES/apache.init:1.44	Sun Jul 10 01:22:28 2005
+++ SOURCES/apache.init	Sat Oct 29 17:20:22 2005
@@ -82,14 +82,12 @@
   reload|force-reload|graceful)
 	if [ -f /var/lock/subsys/httpd ]; then
 		msg_reloading httpd.${HTTPD_MPM}
-		httpd.${HTTPD_MPM} $CFG -t > /dev/null 2>&1
+		run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t
 		RETVAL=$?
 		if [ $RETVAL -eq 0 ]; then
+			msg_reloading httpd.${HTTPD_MPM}
 			daemon httpd.${HTTPD_MPM} $CFG -k graceful
 			RETVAL=$?
-		else
-			fail
-			echo "Configuration file syntax test failed."
 		fi
 	else
 		msg_not_running httpd.${HTTPD_MPM} >&2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache.init?r1=1.44&r2=1.45&f=u