- up to 3.24.1

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

diff --git a/syslog-ng.init b/syslog-ng.init
old mode 100644 (file)
new mode 100755 (executable)
index 1a5bb1b..073a96f
--- 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,9 +102,13 @@ reload() {
 }
 
 flush_logs() {
-       if use_upstart && [ -f /etc/init/syslog-ng.conf ]; then
-               /sbin/initctl reload syslog-ng
-       elif [ -f /var/lock/subsys/syslog-ng ] || service syslog-ng status >/dev/null; then
+       if [ -x /bin/systemd_booted ] && /bin/systemd_booted; then
+               checkconfig
+               msg_reloading "syslog-ng"
+               /bin/systemctl reload syslog-ng.service
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && ok || fail
+       elif [ -f /var/lock/subsys/syslog-ng ]; then
                checkconfig
                msg_reloading "syslog-ng"
                killproc syslog-ng -HUP
@@ -119,8 +119,6 @@ flush_logs() {
        fi
 }
 
-upstart_controlled --except checkconfig configtest flush-logs
-
 RETVAL=0
 # See how we were called.
 case "$1" in