- flush-logs: invoke systemd in systemd mode; use rc-scripts messages

Changed files:
    syslog-ng.init -> 1.41

diff --git a/syslog-ng.init b/syslog-ng.init
index 1a5bb1b38c069b6da4011d5af122d4dc5d82b2dd..5dd26392ecd3c7190b813f6ba1aec7f183e3b2b3 100644 (file)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -107,8 +107,15 @@ reload() {
 
 flush_logs() {
        if use_upstart && [ -f /etc/init/syslog-ng.conf ]; then
+               checkconfig
                /sbin/initctl reload syslog-ng
-       elif [ -f /var/lock/subsys/syslog-ng ] || service syslog-ng status >/dev/null; then
+       elif [ -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