SOURCES: syslog-ng.init - unify

[glen]

Author: glen                         Date: Mon Jan 26 22:23:48 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- unify

---- Files affected:
SOURCES:
   syslog-ng.init (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SOURCES/syslog-ng.init
diff -u SOURCES/syslog-ng.init:1.24 SOURCES/syslog-ng.init:1.25
--- SOURCES/syslog-ng.init:1.24	Mon Jan 26 23:21:33 2009
+++ SOURCES/syslog-ng.init	Mon Jan 26 23:23:42 2009
@@ -62,6 +62,7 @@
 
 condrestart() {
 	if [ -f /var/lock/subsys/syslog-ng ]; then
+		configtest
 		stop
 		start
 	else
@@ -70,6 +71,18 @@
 	fi
 }
 
+reload() {
+	if [ -f /var/lock/subsys/syslog-ng ]; then
+		configtest
+		msg_reloading "syslog-ng"
+		killproc syslog-ng -HUP
+		RETVAL=$?
+	else
+		msg_not_running "syslog-ng"
+		exit 7
+	fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -85,19 +98,10 @@
 	start
 	;;
   try-restart)
-	configtest
 	condrestart 0
 	;;
   reload|force-reload)
-	if [ -f /var/lock/subsys/syslog-ng ]; then
-		configtest
-		msg_reloading "syslog-ng"
-		killproc syslog-ng -HUP
-		RETVAL=$?
-	else
-		msg_not_running "syslog-ng"
-		exit 7
-	fi
+  	reload
 	;;
   flush-logs)
 	if [ -f /var/lock/subsys/syslog-ng ]; then
================================================================

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