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

diff --git a/syslog-ng-systemd.patch b/syslog-ng-systemd.patch
index 69f763d2d6bc1132fa4833f67a0cdd3c547b6572..9250285434222fa47f0fac3736024c862f87ab14 100644 (file)
--- a/syslog-ng-systemd.patch
+++ b/syslog-ng-systemd.patch
@@ -12,7 +12,7 @@ diff -dur -x '*~' syslog-ng-syslog-ng-3.14.1.orig/contrib/systemd/syslog-ng@.ser
  EnvironmentFile=-/etc/default/syslog-ng@%i
  EnvironmentFile=-/etc/sysconfig/syslog-ng@%i
 -ExecStart=/usr/sbin/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE
-+ExecStart=/sbin/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE --worker-threads=1024 $SYSLOGNG_OPTS
++ExecStart=/sbin/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE $SYSLOGNG_OPTS
  ExecReload=/bin/kill -HUP $MAINPID
  StandardOutput=journal
  StandardError=journal

diff --git a/syslog-ng.init b/syslog-ng.init
index 073a96f227c06aa9dc8aca1ff619a619f0b8cedb..5d03b6babb43258b354baf0127684c70d3fe71d7 100755 (executable)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -60,7 +60,7 @@ start() {
        fi
 
        msg_starting "syslog-ng"
-       daemon @@SBINDIR@@/syslog-ng -f /etc/syslog-ng/syslog-ng.conf --worker-threads=1024 $OPTIONS
+       daemon @@SBINDIR@@/syslog-ng -f /etc/syslog-ng/syslog-ng.conf $OPTIONS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
 }

diff --git a/syslog-ng.spec b/syslog-ng.spec
index e64254b8611daad0136dc234c50f3fb45cf45cb6..055a0545c204e216474aa84e04871ebd455dc12f 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -39,7 +39,7 @@ Summary(pl.UTF-8):    Syslog-ng - systemowy demon logujący nowej generacji
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
 Version:       3.36.1
-Release:       5
+Release:       6
 License:       GPL v2+ with OpenSSL exception
 Group:         Daemons
 #Source0Download: https://github.com/syslog-ng/syslog-ng/releases