packages: syslog-ng/syslog-ng.init - simplify

[glen]

Author: glen                         Date: Fri Dec 24 16:43:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplify

---- Files affected:
packages/syslog-ng:
   syslog-ng.init (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.init
diff -u packages/syslog-ng/syslog-ng.init:1.30 packages/syslog-ng/syslog-ng.init:1.31
--- packages/syslog-ng/syslog-ng.init:1.30	Mon May 10 14:18:23 2010
+++ packages/syslog-ng/syslog-ng.init	Fri Dec 24 17:42:57 2010
@@ -40,55 +40,59 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/syslog-ng ]; then
-		msg_starting "syslog-ng"
-		emit starting JOB=syslog-ng SERVICE=syslog
-		daemon /usr/sbin/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
-		emit --no-wait started JOB=syslog-ng SERVICE=syslog
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
-	else
+	if [ -f /var/lock/subsys/syslog-ng ]; then
 		msg_already_running "syslog-ng"
+		return
 	fi
+
+	msg_starting "syslog-ng"
+	emit starting JOB=syslog-ng SERVICE=syslog
+	daemon /usr/sbin/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
+	emit --no-wait started JOB=syslog-ng SERVICE=syslog
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
 }
 
 stop() {
-	if [ -f /var/lock/subsys/syslog-ng ]; then
-		msg_stopping "syslog-ng"
-		emit stopping JOB=syslog-ng SERVICE=syslog
-		killproc syslog-ng
-		emit --no-wait stopped JOB=syslog-ng SERVICE=syslog
-		rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
-	else
+	if [ ! -f /var/lock/subsys/syslog-ng ]; then
 		msg_not_running "syslog-ng"
+		return
 	fi
+
+	msg_stopping "syslog-ng"
+	emit stopping JOB=syslog-ng SERVICE=syslog
+	killproc syslog-ng
+	emit --no-wait stopped JOB=syslog-ng SERVICE=syslog
+	rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/syslog-ng ]; then
-		configtest
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/syslog-ng ]; then
 		msg_not_running "syslog-ng"
 		RETVAL=$1
+		return
 	fi
+
+	configtest
+	stop
+	start
 }
 
 reload() {
-	if [ -f /var/lock/subsys/syslog-ng ]; then
-		configtest
-		msg_reloading "syslog-ng"
-		killproc syslog-ng -HUP
-		RETVAL=$?
-	else
+	if [ ! -f /var/lock/subsys/syslog-ng ]; then
 		msg_not_running "syslog-ng"
-		exit 7
+		RETVAL=7
+		return
 	fi
+
+	configtest
+	msg_reloading "syslog-ng"
+	killproc syslog-ng -HUP
+	RETVAL=$?
 }
 
 flush_logs() {
-	if use_upstart && [ -f /etc/init/syslog-ng.conf ] ; then
+	if use_upstart && [ -f /etc/init/syslog-ng.conf ]; then
 		/sbin/initctl reload syslog-ng
 	elif [ -f /var/lock/subsys/syslog-ng ]; then
 		configtest
@@ -97,7 +101,7 @@
 		RETVAL=$?
 	else
 		msg_not_running "syslog-ng"
-		exit 7
+		RETVAL=7
 	fi
 }
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.init?r1=1.30&r2=1.31&f=u