drop all Upstart hacks

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

diff --git a/syslog-ng.init b/syslog-ng.init
index 5dd26392ecd3c7190b813f6ba1aec7f183e3b2b3..073a96f227c06aa9dc8aca1ff619a619f0b8cedb 100755 (executable)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -60,11 +60,9 @@ start() {
        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() {
@@ -74,9 +72,7 @@ stop() {
        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
 }
 
@@ -106,10 +102,7 @@ reload() {
 }
 
 flush_logs() {
-       if use_upstart && [ -f /etc/init/syslog-ng.conf ]; then
-               checkconfig
-               /sbin/initctl reload syslog-ng
-       elif [ -x /bin/systemd_booted ] && /bin/systemd_booted; then
+       if [ -x /bin/systemd_booted ] && /bin/systemd_booted; then
                checkconfig
                msg_reloading "syslog-ng"
                /bin/systemctl reload syslog-ng.service
@@ -126,8 +119,6 @@ flush_logs() {
        fi
 }
 
-upstart_controlled --except checkconfig configtest flush-logs
-
 RETVAL=0
 # See how we were called.
 case "$1" in