Rel 6; let it automatically choose worker-threads based on nr of cpus

[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 08a07b6..5d03b6b
--- 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,9 +60,7 @@ start() {
        fi
 
        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
+       daemon @@SBINDIR@@/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
 }
@@ -80,9 +72,7 @@ stop() {
        fi
 
        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
 }
 
@@ -112,8 +102,12 @@ reload() {
 }
 
 flush_logs() {
-       if use_upstart && [ -f /etc/init/syslog-ng.conf ]; then
-               /sbin/initctl reload syslog-ng
+       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"
@@ -125,8 +119,6 @@ flush_logs() {
        fi
 }
 
-upstart_controlled --except checkconfig configtest flush-logs
-
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -146,10 +138,10 @@ case "$1" in
        condrestart 0
        ;;
   reload|force-reload)
-       reload
+       reload
        ;;
   flush-logs)
-       flush_logs
+       flush_logs
        ;;
   checkconfig|configtest)
        checkconfig 1