packages: apache/apache.init - fix output for configration check, merge flu...

glen glen at pld-linux.org
Fri May 8 11:47:03 CEST 2009


Author: glen                         Date: Fri May  8 09:47:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix output for configration check, merge flush-logs with reload

---- Files affected:
packages/apache:
   apache.init (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: packages/apache/apache.init
diff -u packages/apache/apache.init:1.64 packages/apache/apache.init:1.65
--- packages/apache/apache.init:1.64	Mon Feb 16 01:54:56 2009
+++ packages/apache/apache.init	Fri May  8 11:46:57 2009
@@ -99,34 +99,22 @@
   try-restart)
 	condrestart 0
 	;;
-  reload|force-reload|graceful)
+  reload|force-reload|graceful|flush-logs)
 	if [ -f /var/lock/subsys/httpd ]; then
 		configtest
 		if [ $RETVAL -eq 0 ]; then
-			msg_reloading "$SVC_NAME"
-			busy
+			msg_reloading "$SVC_NAME"; busy
 			/usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS -k graceful
 			RETVAL=$?
 			[ $RETVAL -eq 0 ] && ok || fail
-		fi
-	else
-		msg_not_running "$SVC_NAME"
-		RETVAL=7
-	fi
-	;;
-  flush-logs)
-	if [ -f /var/lock/subsys/httpd ]; then
-		msg_reloading "$SVC_NAME"
-
-		configtest
-		if [ $RETVAL -eq 0 ]; then
-			/usr/sbin/httpd.${HTTPD_MPM} $CFG -k graceful
-			RETVAL=$?
-			[ $RETVAL -eq 0 ] && ok || fail
 		else
+			show "Checking configuration"; busy
 			fail
 			echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
 		fi
+	else
+		msg_not_running "$SVC_NAME"
+		RETVAL=7
 	fi
 	;;
   configtest)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.init?r1=1.64&r2=1.65&f=u



More information about the pld-cvs-commit mailing list