- do not package loggen (it's a syslog-ng testing tool)

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

diff --git a/syslog-ng.init b/syslog-ng.init
index 71cb5ebd9ea6443ca4815208ffd69845a6830e5f..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 \
@@ -21,15 +21,28 @@ 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
+}
+
 configtest() {
-       syslog-ng $OPTIONS -s
+       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
@@ -43,71 +56,82 @@ stop() {
                killproc syslog-ng
                rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
        else
-               msg_not_running syslog-ng
+               msg_not_running "syslog-ng"
        fi
 }
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-       start
-       ;;
-  stop)
-       stop
-       ;;
-  restart)
-       configtest
-       RETVAL=$?
-       if [ $RETVAL -eq 0 ]; then
+condrestart() {
+       if [ -f /var/lock/subsys/syslog-ng ]; then
+               configtest
                stop
                start
        else
-               fail
-               echo >&2 "Configuration file syntax test failed."
+               msg_not_running "syslog-ng"
+               RETVAL=$1
        fi
-       ;;
-  configtest)
-       configtest
-       exit $?
-       ;;
-  reload|force-reload)
+}
+
+reload() {
        if [ -f /var/lock/subsys/syslog-ng ]; then
-               msg_reloading "syslog-ng"
                configtest
+               msg_reloading "syslog-ng"
+               killproc syslog-ng -HUP
                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
+               msg_not_running "syslog-ng"
                exit 7
        fi
-       ;;
-  flush-logs)
+}
+
+flush_logs() {
        if [ -f /var/lock/subsys/syslog-ng ]; then
-               msg_reloading "syslog-ng"
                configtest
+               msg_reloading "syslog-ng"
+               killproc syslog-ng -HUP
                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"
+               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
+       ;;
+  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}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status|configtest|flush-logs}"
        exit 3
 esac