!24 add RSYSLOG_OPTIONS and organize rsyslog.service files

From: @wcc_140409
Reviewed-by: @overweight
Signed-off-by: @overweight

rsyslog.service

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

rsyslog.spec

@@ -4,7 +4,7 @@
 
 Name:           rsyslog
 Version:        8.2012.0
-Release:        2
+Release:        3
 Summary:        The rocket-fast system for log processing
 License:        (GPLv3+ and ASL 2.0)
 URL:            http://www.rsyslog.com/
@@ -358,6 +358,12 @@ done
 %{_mandir}/man1/rscryutil.1.gz
 
 %changelog
+* Wed Aug 25 2021 wuchaochao <wuchaochao4@huawei.com> - 8.2012.0-3
+- Type:NA
+- ID:NA
+- SUG:restart
+- DESC:add RSYSLOG_OPTIONS and organize rsyslog.service files
+
 * Fri Jun 11 2021 shangyibin<shangyibin1@huawei.com> - 8.2012.0-2
 - Type:NA
 - ID:NA

rsyslog.sysconfig

@@ -2,4 +2,4 @@
 # Syslogd options are deprecated since rsyslog v3.
 # If you want to use them, switch to compatibility mode 2 by "-c 2"
 # See rsyslogd(8) for more details
-SYSLOGD_OPTIONS=""
+SYSLOGD_OPTIONS="-i/var/run/rsyslogd.pid"