Author: glen                         Date: Thu May 11 21:44:00 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add confitest to restart and reload

---- Files affected:
SOURCES:
   syslog-ng.init (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SOURCES/syslog-ng.init
diff -u SOURCES/syslog-ng.init:1.13 SOURCES/syslog-ng.init:1.14
--- SOURCES/syslog-ng.init:1.13 Thu May 11 23:36:32 2006
+++ SOURCES/syslog-ng.init      Thu May 11 23:43:55 2006
@@ -21,6 +21,10 @@
        . /etc/sysconfig/syslog-ng
 fi
 
+configtest() {
+       syslog-ng $OPTIONS -s
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -49,15 +53,33 @@
        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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/syslog-ng.init?r1=1.13&r2=1.14&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to