SOURCES: varnish.init - pldize, use functions

[glen]

Author: glen                         Date: Mon Jul  2 11:41:35 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- pldize, use functions

---- Files affected:
SOURCES:
   varnish.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/varnish.init
diff -u SOURCES/varnish.init:1.1 SOURCES/varnish.init:1.2
--- SOURCES/varnish.init:1.1	Mon Nov 27 00:41:06 2006
+++ SOURCES/varnish.init	Mon Jul  2 13:41:30 2007
@@ -11,7 +11,6 @@
 # Source function library.
 . /etc/init.d/functions
 
-RETVAL=0
 PROCNAME=varnishd
 
 . /etc/sysconfig/varnish
@@ -24,51 +23,49 @@
 		-w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \
 		-s ${VARNISH_BACKEND_STORAGE}"	
 
+start() {
+	if [ ! -f /var/lock/subsys/varnishd ]; then
+		msg_starting "Varnish HTTP accelerator"
+		daemon $DAEMON "$DAEMON_OPTS"
+		sleep 1
+		pkill -0 $PROCNAME
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/varnishd
+	else
+		msg_already_running "Varnish HTTP accelerator"
+	fi
+}
 
-mkdir -p /var/run/varnish 2>/dev/null
+stop() {
+	if [ -f /var/lock/subsys/varnishd ]; then
+		msg_stopping "Varnish HTTP accelerator"
+		killproc $DAEMON
+		rm -f /var/lock/subsys/varnishd
+	else
+		msg_not_running "Varnish HTTP accelerator"
+	fi
+}
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-	echo -n "Starting varnish HTTP accelerator: "
-	daemon $DAEMON "$DAEMON_OPTS"
-	sleep 1
-	pkill -0 $PROCNAME
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ]
-	then
-		echo_success
-		touch /var/lock/subsys/varnishd
-	else
-		echo_failure
-	fi
-	echo
+  	start
 	;;
   stop)
-	echo -n "Stopping varnish HTTP accelerator: "
-	killproc $DAEMON
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ]
-	then
-		echo_success
-		rm -f /var/lock/subsys/varnishd
-	else
-		echo_failure
-	fi
-	echo
+  	stop
 	;;
   status)
 	status $PROCNAME
 	RETVAL=$?
 	;;
   restart|reload)
-  	$0 stop
-	$0 start
-	RETVAL=$?
+  	stop
+	start
 	;;
   *)
-	echo "Usage: $0 {start|stop|status|restart}"
-	exit 1
+	msg_usage "$0 {start|stop|status|restart}"
+	exit 3
 esac
 
 exit $RETVAL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/varnish.init?r1=1.1&r2=1.2&f=u