- unify checkconfig usage from rc-scripts template.init

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

diff --git a/syslog-ng.init b/syslog-ng.init
index 63b74c20a3b5f39b339c991554d4a4baca87d745..faac12013af9b77ea50c53b12aa7b3ef249f073b 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,72 +21,145 @@ if [ -f /etc/sysconfig/syslog-ng ]; then
        . /etc/sysconfig/syslog-ng
 fi
 
+# configtest itself
+# must return non-zero if check failed
+# output is discarded if checkconfig is ran without details
 configtest() {
-       syslog-ng $OPTIONS -s
+       syslog-ng $OPTIONS -F -s -p /var/run/syslog-ng-syntaxcheck.pid
+       return $?
 }
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/syslog-ng ]; then
-               msg_starting "syslog-ng"
-               daemon syslog-ng $OPTIONS
+# wrapper for configtest
+checkconfig() {
+       local details=${1:-0}
+
+       if [ $details = 1 ]; then
+               # run config test and display report (status action)
+               show "Checking %s configuration" "syslog-ng"; busy
+               local out
+               out=$(configtest 2>&1)
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
+               if [ $RETVAL = 0 ]; then
+                       ok
+               else
+                       fail
+               fi
+               [ "$out" ] && echo >&2 "$out"
        else
-               msg_already_running "syslog-ng"
+               # run config test and abort with nice message if failed
+               # (for actions checking status before action).
+               configtest >/dev/null 2>&1
+               RETVAL=$?
+               if [ $RETVAL != 0 ]; then
+                       show "Checking %s configuration" "syslog-ng"; fail
+                       nls 'Configuration test failed. See details with %s "checkconfig"' $0
+                       exit $RETVAL
+               fi
        fi
-       ;;
-  stop)
+}
+
+start() {
+       # Check if the service is already running?
        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
+               msg_already_running "syslog-ng"
+               return
        fi
-       ;;
-  status)
-       status syslog-ng
-       exit $?
-       ;;
-  restart)
-       configtest
+
+       msg_starting "syslog-ng"
+       emit starting JOB=syslog-ng SERVICE=syslog
+       daemon /usr/sbin/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
+       emit --no-wait started JOB=syslog-ng SERVICE=syslog
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/syslog-ng ]; then
+               msg_not_running "syslog-ng"
+               return
+       fi
+
+       msg_stopping "syslog-ng"
+       emit stopping JOB=syslog-ng SERVICE=syslog
+       killproc syslog-ng
+       emit --no-wait stopped JOB=syslog-ng SERVICE=syslog
+       rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/syslog-ng ]; then
+               msg_not_running "syslog-ng"
+               RETVAL=$1
+               return
+       fi
+
+       checkconfig
+       stop
+       start
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/syslog-ng ]; then
+               msg_not_running "syslog-ng"
+               RETVAL=7
+               return
+       fi
+
+       checkconfig
+       msg_reloading "syslog-ng"
+       killproc syslog-ng -HUP
        RETVAL=$?
-       if [ $RETVAL -eq 0 ]; then
-               $0 stop
-               $0 start
+}
+
+flush_logs() {
+       if use_upstart && [ -f /etc/init/syslog-ng.conf ]; then
+               /sbin/initctl reload syslog-ng
+       elif [ -f /var/lock/subsys/syslog-ng ]; then
+               checkconfig
+               msg_reloading "syslog-ng"
+               killproc syslog-ng -HUP
                RETVAL=$?
        else
-               fail
-               echo >&2 "Configuration file syntax test failed."
+               msg_not_running "syslog-ng"
+               RETVAL=7
        fi
+}
+
+upstart_controlled --except checkconfig configtest flush-logs
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       configtest
+       start
        ;;
-  configtest)
+  stop)
+       stop
+       ;;
+  restart)
        configtest
-       exit $?
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
        ;;
   reload|force-reload)
-       if [ -f /var/lock/subsys/syslog-ng ]; then
-               msg_reloading "syslog-ng"
-               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
-       fi
+       reload
+       ;;
+  flush-logs)
+       flush_logs
+       ;;
+  checkconfig|configtest)
+       checkconfig 1
+       ;;
+  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|checkconfig|flush-logs}"
        exit 3
 esac