From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 11 May 2006 21:43:55 +0000 (+0000)
Subject: - add confitest to restart and reload
X-Git-Tag: auto/th/syslog-ng-1_9_11-1~2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=98e38ddd3ee0e5e5e4b01826ae78b813dc601d18;p=packages%2Fsyslog-ng.git

- add confitest to restart and reload

Changed files:
    syslog-ng.init -> 1.14
---

diff --git a/syslog-ng.init b/syslog-ng.init
index a7925e9..63b74c2 100644
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -21,6 +21,10 @@ if [ -f /etc/sysconfig/syslog-ng ]; then
 	. /etc/sysconfig/syslog-ng
 fi
 
+configtest() {
+	syslog-ng $OPTIONS -s
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -49,15 +53,33 @@ case "$1" in
 	exit $?
 	;;
   restart)
-	$0 stop
-	$0 start
+	configtest
+	RETVAL=$?
+	if [ $RETVAL -eq 0 ]; then
+		$0 stop
+		$0 start
+		RETVAL=$?
+	else
+		fail
+		echo >&2 "Configuration file syntax test failed."
+	fi
+	;;
+  configtest)
+	configtest
 	exit $?
 	;;
   reload|force-reload)
 	if [ -f /var/lock/subsys/syslog-ng ]; then
 		msg_reloading "syslog-ng"
-		killproc syslog-ng -HUP
+		configtest
 		RETVAL=$?
+		if [ $RETVAL -eq 0 ]; then
+			killproc syslog-ng -HUP
+			RETVAL=$?
+		else
+			fail
+			echo >&2 "Configuration file syntax test failed."
+		fi
 	else
 		msg_not_running syslog-ng >&2
 		exit 7