- emit started/stopped with --no-wait to prevent lock-ups on simple configuration...

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

diff --git a/syslog-ng.init b/syslog-ng.init
index 72c62eb41c651d13f9c8287c8408b68bf6445e9f..ba07012abb07764f90c41ade1ca7e38f6ce00111 100644 (file)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -42,7 +42,9 @@ start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/syslog-ng ]; then
                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
        else
@@ -53,7 +55,9 @@ start() {
 stop() {
        if [ -f /var/lock/subsys/syslog-ng ]; then
                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
        else
                msg_not_running "syslog-ng"
@@ -83,8 +87,10 @@ reload() {
        fi
 }
 
-flush-logs() {
-       if [ -f /var/lock/subsys/syslog-ng ]; then
+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
                configtest
                msg_reloading "syslog-ng"
                killproc syslog-ng -HUP
@@ -95,10 +101,13 @@ flush-logs() {
        fi
 }
 
+upstart_controlled --except configtest flush-logs
+
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
+       configtest
        start
        ;;
   stop)
@@ -116,7 +125,7 @@ case "$1" in
        reload
        ;;
   flush-logs)
-       flush-logs
+       flush_logs
        ;;
   configtest)
        show "Checking syslog-ng config syntax"