- fix flush-logs in systemd mode, we need generic way doing this instead of each...

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

diff --git a/syslog-ng.init b/syslog-ng.init
index 138641f3a509bff81949b288df958421d167ff18..1a5bb1b38c069b6da4011d5af122d4dc5d82b2dd 100644 (file)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -10,12 +10,6 @@
 # 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
@@ -66,11 +60,11 @@ start() {
        fi
 
        msg_starting "syslog-ng"
-       emit starting JOB=syslog-ng SERVICE=syslog
-       daemon @@SBINDIR@@/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
-       emit --no-wait started JOB=syslog-ng SERVICE=syslog
+       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() {
@@ -80,9 +74,9 @@ stop() {
        fi
 
        msg_stopping "syslog-ng"
-       emit stopping JOB=syslog-ng SERVICE=syslog
+       emit stopping JOB=syslog-ng SERVICE_syslog=y
        killproc syslog-ng
-       emit --no-wait stopped JOB=syslog-ng SERVICE=syslog
+       emit --no-wait stopped JOB=syslog-ng SERVICE_syslog=y
        rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
 }
 
@@ -114,7 +108,7 @@ 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 ]; then
+       elif [ -f /var/lock/subsys/syslog-ng ] || service syslog-ng status >/dev/null; then
                checkconfig
                msg_reloading "syslog-ng"
                killproc syslog-ng -HUP
@@ -146,10 +140,10 @@ case "$1" in
        condrestart 0
        ;;
   reload|force-reload)
-       reload
+       reload
        ;;
   flush-logs)
-       flush_logs
+       flush_logs
        ;;
   checkconfig|configtest)
        checkconfig 1