- pl for -systemd

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

diff --git a/syslog-ng.init b/syslog-ng.init
index 72c62eb41c651d13f9c8287c8408b68bf6445e9f..2416973d16ca62236c90a3bcbcbff505c1b12303 100644 (file)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -2,7 +2,7 @@
 #
 # syslog       Starts syslog-ng (syslogd replacement).
 #
-# chkconfig:   2345 30 70
+# chkconfig:   2345 17 83
 # description: Syslog is the facility by which many daemons use to log \
 #              messages to various system log files. It is a good idea to \
 #              always run syslog.
@@ -10,95 +10,122 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-# Set defaults
-ENABLE_RECEIVE_FROM_NET=no
-HOSTLIST=""
-DOMAINLIST=""
-MARK_TIMESTAMP=""
-
 # Get service config
 if [ -f /etc/sysconfig/syslog-ng ]; then
        . /etc/sysconfig/syslog-ng
 fi
 
-checkconfig() {
+# configtest itself
+# must return non-zero if check failed
+# output is discarded if checkconfig is ran without details
+configtest() {
        syslog-ng $OPTIONS -F -s -p /var/run/syslog-ng-syntaxcheck.pid
-       RETVAL=$?
-       return $RETVAL
+       return $?
 }
 
-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
+# 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=$?
+               if [ $RETVAL = 0 ]; then
+                       ok
+               else
+                       fail
+               fi
+               [ "$out" ] && echo >&2 "$out"
+       else
+               # 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
 }
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/syslog-ng ]; then
-               msg_starting "syslog-ng"
-               daemon /usr/sbin/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
-       else
+       if [ -f /var/lock/subsys/syslog-ng ]; then
                msg_already_running "syslog-ng"
+               return
        fi
+
+       msg_starting "syslog-ng"
+       emit starting JOB=syslog-ng SERVICE_syslog=y
+       daemon @@SBINDIR@@/syslog-ng -f /etc/syslog-ng/syslog-ng.conf --worker-threads=1024 $OPTIONS
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
+       emit --no-wait started JOB=syslog-ng SERVICE_syslog=y
 }
 
 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
+       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=y
+       killproc syslog-ng
+       emit --no-wait stopped JOB=syslog-ng SERVICE_syslog=y
+       rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
 }
 
 condrestart() {
-       if [ -f /var/lock/subsys/syslog-ng ]; then
-               configtest
-               stop
-               start
-       else
+       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
-               configtest
-               msg_reloading "syslog-ng"
-               killproc syslog-ng -HUP
-               RETVAL=$?
-       else
+       if [ ! -f /var/lock/subsys/syslog-ng ]; then
                msg_not_running "syslog-ng"
-               exit 7
+               RETVAL=7
+               return
        fi
+
+       checkconfig
+       msg_reloading "syslog-ng"
+       killproc syslog-ng -HUP
+       RETVAL=$?
 }
 
-flush-logs() {
-       if [ -f /var/lock/subsys/syslog-ng ]; then
-               configtest
+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
                msg_not_running "syslog-ng"
-               exit 7
+               RETVAL=7
        fi
 }
 
+upstart_controlled --except checkconfig configtest flush-logs
+
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
+       configtest
        start
        ;;
   stop)
@@ -113,24 +140,20 @@ case "$1" in
        condrestart 0
        ;;
   reload|force-reload)
-       reload
+       reload
        ;;
   flush-logs)
-       flush-logs
+       flush_logs
        ;;
-  configtest)
-       show "Checking syslog-ng config syntax"
-       res=$(checkconfig 2>&1)
-       RETVAL=$?
-       [ $RETVAL = 0 ] && ok || fail
-       echo >&2 "$res"
+  checkconfig|configtest)
+       checkconfig 1
        ;;
   status)
        status syslog-ng
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status|configtest|flush-logs}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status|checkconfig|flush-logs}"
        exit 3
 esac