!28 Sync update 21.09 branch code patch

From: @wcc_140409
Reviewed-by: @overweight
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2021-09-16 11:57:36 +00:00 committed by Gitee
commit e61ae858e3
2 changed files with 7 additions and 4 deletions

View File

@ -1,18 +1,18 @@
[Unit] [Unit]
Description=System Logging Service Description=System Logging Service
;Requires=syslog.socket ;Requires=syslog.socket
Wants=network.target network-online.target
After=network.target network-online.target
Documentation=man:rsyslogd(8) Documentation=man:rsyslogd(8)
Documentation=https://www.rsyslog.com/doc/ Documentation=https://www.rsyslog.com/doc/
[Service] [Service]
Type=notify Type=notify
EnvironmentFile=-/etc/sysconfig/rsyslog EnvironmentFile=-/etc/sysconfig/rsyslog
ExecStart=/usr/sbin/rsyslogd -n $SYSLOGD_OPTIONS ExecStart=/usr/sbin/rsyslogd -n -i/var/run/rsyslogd.pid $SYSLOGD_OPTIONS
ExecReload=/usr/bin/kill -HUP $MAINPID
UMask=0066 UMask=0066
StandardOutput=null StandardOutput=null
Restart=on-failure Restart=on-failure
# Increase the default a bit in order to allow many simultaneous # Increase the default a bit in order to allow many simultaneous
# files to be monitored, we might need a lot of fds. # files to be monitored, we might need a lot of fds.
LimitNOFILE=16384 LimitNOFILE=16384

View File

@ -4,7 +4,7 @@
Name: rsyslog Name: rsyslog
Version: 8.2012.0 Version: 8.2012.0
Release: 2 Release: 3
Summary: The rocket-fast system for log processing Summary: The rocket-fast system for log processing
License: (GPLv3+ and ASL 2.0) License: (GPLv3+ and ASL 2.0)
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
@ -358,6 +358,9 @@ done
%{_mandir}/man1/rscryutil.1.gz %{_mandir}/man1/rscryutil.1.gz
%changelog %changelog
* Mon Aug 30 2021 wuchaochao<wuchaochao4@huawei.com> - 8.2012.0-3
- Sync update 21.09 branch code patch
* Fri Jun 11 2021 shangyibin<shangyibin1@huawei.com> - 8.2012.0-2 * Fri Jun 11 2021 shangyibin<shangyibin1@huawei.com> - 8.2012.0-2
- Type:NA - Type:NA
- ID:NA - ID:NA