packages: memcached/memcached.init - formatting cosmetics

[glen]

Author: glen                         Date: Thu May  6 11:33:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- formatting cosmetics

---- Files affected:
packages/memcached:
   memcached.init (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/memcached/memcached.init
diff -u packages/memcached/memcached.init:1.7 packages/memcached/memcached.init:1.8
--- packages/memcached/memcached.init:1.7	Sat Nov 29 12:31:27 2008
+++ packages/memcached/memcached.init	Thu May  6 13:33:10 2010
@@ -31,49 +31,64 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/memcached ]; then
-		local listen ip port ret=0
-		for listen in $LISTEN; do
-			ip=${listen%:*}
-			port=${listen##*:}
-			msg_starting "memcached ($ip:$port)"
-			pidfile=/var/run/memcached/"$ip.$port.pid"
-			daemon --pidfile $pidfile --user $MEMCACHED_RUNAS \
-				/usr/sbin/memcached -d -P $pidfile -l $ip -p $port \
-				-m $MEMUSAGE -c $MAXCONN -u $MEMCACHED_RUNAS $MEMCACHED_OPTS
-			ret=$?
-			[ $ret = 0 ] || RETVAL=$?
-		done
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/memcached
-	else
-		msg_already_running memcached
+	if [ -f /var/lock/subsys/memcached ]; then
+		msg_already_running "memcached"
+		return
 	fi
+
+	local listen ip port ret=0
+	for listen in $LISTEN; do
+		ip=${listen%:*}
+		port=${listen##*:}
+		msg_starting "memcached ($ip:$port)"
+		pidfile=/var/run/memcached/"$ip.$port.pid"
+		daemon --pidfile $pidfile --user $MEMCACHED_RUNAS \
+			/usr/sbin/memcached -d -P $pidfile -l $ip -p $port \
+			-m $MEMUSAGE -c $MAXCONN -u $MEMCACHED_RUNAS $MEMCACHED_OPTS
+		ret=$?
+		[ $ret = 0 ] || RETVAL=$?
+	done
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/memcached
 }
 
 stop() {
-	if [ -f /var/lock/subsys/memcached ]; then
-		local listen ip port
-		for listen in $LISTEN; do
-			ip=${listen%:*}
-			port=${listen##*:}
-			msg_stopping "memcached ($ip:$port)"
-			pidfile=/var/run/memcached/"$ip.$port.pid"
-			killproc --pidfile $pidfile memcached
-		done
-		rm -f /var/lock/subsys/memcached >/dev/null 2>&1
-	else
-		msg_not_running memcached
+	if [ ! -f /var/lock/subsys/memcached ]; then
+		msg_not_running "memcached"
+		return
 	fi
+
+	local listen ip port
+	for listen in $LISTEN; do
+		ip=${listen%:*}
+		port=${listen##*:}
+		msg_stopping "memcached ($ip:$port)"
+		pidfile=/var/run/memcached/"$ip.$port.pid"
+		killproc --pidfile $pidfile memcached
+	done
+	rm -f /var/lock/subsys/memcached >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/memcached ]; then
-		stop
-		start
-	else
-		msg_not_running memcached
+	if [ ! -f /var/lock/subsys/memcached ]; then
+		msg_not_running "memcached"
 		RETVAL=$1
+		return
+	fi
+
+	stop
+	start
+}
+
+reload() {
+	if [ ! -f /var/lock/subsys/memcached ]; then
+		msg_not_running "memcached"
+		RETVAL=7
+		return
 	fi
+
+	msg_reloading "memcached"
+	killproc memcached -HUP
+	RETVAL=$?
 }
 
 RETVAL=0
@@ -93,14 +108,7 @@
 	condrestart 0
 	;;
   reload|force-reload)
-	if [ -f /var/lock/subsys/memcached ]; then
-		msg_reloading memcached
-		killproc memcached -HUP
-		RETVAL=$?
-	else
-		msg_not_running memcached
-		RETVAL=7
-	fi
+  	reload
 	;;
   status)
 	status memcached
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/memcached/memcached.init?r1=1.7&r2=1.8&f=u