httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1004268 - /httpd/httpd/branches/2.2.x/build/rpm/htcacheclean.init
Date Mon, 04 Oct 2010 14:49:11 GMT
Author: minfrin
Date: Mon Oct  4 14:49:10 2010
New Revision: 1004268

URL: http://svn.apache.org/viewvc?rev=1004268&view=rev
Log:
RPM init script: Update the htcacheclean init script to take into
account the pid of the running htcacheclean process. This enables
htcacheclean to be enabled more than once to clean multiple caches
on the same machine.

Modified:
    httpd/httpd/branches/2.2.x/build/rpm/htcacheclean.init

Modified: httpd/httpd/branches/2.2.x/build/rpm/htcacheclean.init
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/rpm/htcacheclean.init?rev=1004268&r1=1004267&r2=1004268&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/rpm/htcacheclean.init (original)
+++ httpd/httpd/branches/2.2.x/build/rpm/htcacheclean.init Mon Oct  4 14:49:10 2010
@@ -37,14 +37,18 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-if [ -f /etc/sysconfig/htcacheclean ]; then
-        . /etc/sysconfig/htcacheclean
+# What were we called? Multiple instances of the same daemon can be
+# created by creating suitably named symlinks to this startup script
+prog=$(basename $0 | sed -e 's/^[SK][0-9][0-9]//')
+
+if [ -f /etc/sysconfig/${prog} ]; then
+        . /etc/sysconfig/${prog}
 fi
 
-# Path to the apachectl script, server binary, and short-form for messages.
+# Path to htcacheclean, server binary, and short-form for messages.
 htcacheclean=${HTTPD-/usr/sbin/htcacheclean}
-prog=htcacheclean
-lockfile=${LOCKFILE-/var/lock/subsys/htcacheclean}
+lockfile=${LOCKFILE-/var/lock/subsys/${prog}}
+pidfile=/var/log/httpd/${prog}.pid
 interval=${INTERVAL-10}
 cachepath=${CACHEPATH-/var/cache/httpd/cache-root}
 limit=${LIMIT-100M}
@@ -52,7 +56,7 @@ RETVAL=0
 
 start() {
         echo -n $"Starting $prog: "
-        daemon $htcacheclean -d "$interval" -p "$cachepath" -l "$limit" $OPTIONS
+        daemon --pidfile=${pidfile} $htcacheclean -d "$interval" -p "$cachepath" -l "$limit"
-P "$pidfile" $OPTIONS
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch ${lockfile}
@@ -60,7 +64,7 @@ start() {
 }
 stop() {
 	echo -n $"Stopping $prog: "
-	killproc $htcacheclean
+	killproc -p ${pidfile} $htcacheclean
 	RETVAL=$?
 	echo
 	[ $RETVAL = 0 ] && rm -f ${lockfile}
@@ -75,7 +79,7 @@ case "$1" in
 	stop
 	;;
   status)
-        status $htcacheclean
+        status -p ${pidfile} $htcacheclean
 	RETVAL=$?
 	;;
   restart)
@@ -83,7 +87,7 @@ case "$1" in
 	start
 	;;
   condrestart)
-	if status $htcacheclean >&/dev/null; then
+	if status -p ${pidfile} $htcacheclean >&/dev/null; then
 		stop
 		start
 	fi



Mime
View raw message