[Pkg-apache-commits] r1142 - /trunk/apache2/apache2.2-common.apache2.init

[sf at alioth.debian.org]

Author: sf
Date: Sun Feb  7 09:36:10 2010
New Revision: 1142

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1142
Log:
Improve htcacheclean handling

Modified:
    trunk/apache2/apache2.2-common.apache2.init

Modified: trunk/apache2/apache2.2-common.apache2.init
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2.2-common.apache2.init?rev=1142&op=diff
==============================================================================
--- trunk/apache2/apache2.2-common.apache2.init (original)
+++ trunk/apache2/apache2.2-common.apache2.init Sun Feb  7 09:36:10 2010
@@ -85,14 +85,15 @@
 
 start_htcacheclean() {
 	if [ ! -d "$HTCACHECLEAN_PATH" ] ; then
-		echo "Directory $HTCACHECLEAN_PATH does not exist!" >&2
+		echo "... directory $HTCACHECLEAN_PATH does not exist!" >&2
+		return 1
 	fi	
 	$HTCACHECLEAN $HTCACHECLEAN_OPTIONS -d$HTCACHECLEAN_DAEMON_INTERVAL \
 			-i -p$HTCACHECLEAN_PATH -l$HTCACHECLEAN_SIZE
 }
 
 stop_htcacheclean() {
-	pkill htcacheclean 2> /dev/null || echo ...not running
+	pkill -P 1 -f "htcacheclean.*\\<-p$HTCACHECLEAN_PATH\\>" 2> /dev/null || echo ...not running
 }
 
 pidof_apache() {