- fixed test cases

[packages/syslog-ng.git] / syslog-ng.init

diff --git a/syslog-ng.init b/syslog-ng.init
index 7d1da0e8b9d77ef1faf08f371071ce0595dd43db..2ae567791ee8e137eb71d3e0bb0c88e8e0ac98d1 100644 (file)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# syslog       Starts syslog-ng (syslogd replacment).
+# syslog       Starts syslog-ng (syslogd replacement).
 #
 # chkconfig:   2345 30 70
 # description: Syslog is the facility by which many daemons use to log \
@@ -10,70 +10,129 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-# Get network config
-. /etc/sysconfig/network
-
-# Set defaults 
+# Set defaults
 ENABLE_RECEIVE_FROM_NET=no
 HOSTLIST=""
 DOMAINLIST=""
 MARK_TIMESTAMP=""
 
-[ -f /usr/sbin/syslog-ng ] || exit 0
-[ -f /etc/syslog-ng/syslog-ng.conf ] || exit 0
-
 # Get service config
-if [ -f /etc/sysconfig/syslog-ng ] ; then
+if [ -f /etc/sysconfig/syslog-ng ]; then
        . /etc/sysconfig/syslog-ng
 fi
 
+checkconfig() {
+       syslog-ng $OPTIONS -F -s -p /var/run/syslog-ng-syntaxcheck.pid
+       RETVAL=$?
+       return $RETVAL
+}
 
-# See how we were called.
-case "$1" in
-  start)
+configtest() {
+       checkconfig 2>/dev/null
+       RETVAL=$?
+       if [ $RETVAL != 0 ]; then
+               show "Checking syslog-ng config syntax"
+               fail
+               echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
+               exit $RETVAL
+       fi
+}
+
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/syslog-ng ]; then
                msg_starting "syslog-ng"
-               daemon syslog-ng $OPTIONS
+               daemon /usr/sbin/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
        else
                msg_already_running "syslog-ng"
        fi
-       ;;
-  stop)        
+}
+
+stop() {
        if [ -f /var/lock/subsys/syslog-ng ]; then
                msg_stopping "syslog-ng"
                killproc syslog-ng
                rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
        else
-               msg_not_running syslog-ng
-               exit 1
-       fi      
-       ;;
-  status)
-       status syslog-ng
-       ;;
-  restart)
-       $0 stop
-       $0 start
-       ;;
-  reload)
+               msg_not_running "syslog-ng"
+       fi
+}
+
+condrestart() {
+       if [ -f /var/lock/subsys/syslog-ng ]; then
+               configtest
+               stop
+               start
+       else
+               msg_not_running "syslog-ng"
+               RETVAL=$1
+       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 1
+               msg_not_running "syslog-ng"
+               exit 7
        fi
+}
+
+flush_logs() {
+       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
+  start)
+       configtest
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart)
+       configtest
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
        ;;
-  force-reload)
-       $0 reload
+  reload|force-reload)
+       reload
+       ;;
+  flush-logs)
+       flush_logs
+       ;;
+  configtest)
+       show "Checking syslog-ng config syntax"
+       res=$(checkconfig 2>&1)
+       RETVAL=$?
+       [ $RETVAL = 0 ] && ok || fail
+       echo >&2 "$res"
+       ;;
+  status)
+       status syslog-ng
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status|configtest|flush-logs}"
+       exit 3
 esac
 
 exit $RETVAL