summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2024-10-10 08:54:52 -0400
committerGitHub <noreply@github.com>2024-10-10 08:54:52 -0400
commitcc7d89a82b089f52d4499e1bf5e76bb80a047f97 (patch)
tree5e0d6863e1279aae0a5bb3546141bc3b6644b68f
parent2634ad94c649b9ec7b22165cfbfb00cfc60aa949 (diff)
parentf57a56bca0093e52e6edce8a1829520f7f4f4fbb (diff)
Merge pull request #17054 from opensourcerouting/fix/add_missing_logrotate_mgmtd
tools: Add missing mgmtd into logrotate/rsyslogd
-rw-r--r--redhat/frr.logrotate8
-rw-r--r--tools/etc/logrotate.d/frr2
-rw-r--r--tools/etc/rsyslog.d/45-frr.conf2
3 files changed, 11 insertions, 1 deletions
diff --git a/redhat/frr.logrotate b/redhat/frr.logrotate
index 31061e3ae0..1224a332b4 100644
--- a/redhat/frr.logrotate
+++ b/redhat/frr.logrotate
@@ -78,6 +78,14 @@
endscript
}
+/var/log/frr/mgmtd.log {
+ notifempty
+ missingok
+ postrotate
+ /bin/kill -USR1 `cat /var/run/frr/mgmtd.pid 2> /dev/null` 2> /dev/null || true
+ endscript
+}
+
/var/log/frr/nhrpd.log {
notifempty
missingok
diff --git a/tools/etc/logrotate.d/frr b/tools/etc/logrotate.d/frr
index 735af6539b..2da554350b 100644
--- a/tools/etc/logrotate.d/frr
+++ b/tools/etc/logrotate.d/frr
@@ -16,7 +16,7 @@
# between file and syslog, rsyslogd might still have file
# open, as well as the daemons, so always signal the daemons.
# It's safe, a NOP if (only) syslog is being used.
- for i in babeld bgpd eigrpd isisd ldpd nhrpd ospf6d ospfd sharpd \
+ for i in babeld bgpd eigrpd isisd ldpd mgmtd nhrpd ospf6d ospfd sharpd \
pimd pim6d ripd ripngd zebra pathd pbrd staticd bfdd fabricd vrrpd; do
if [ -e /var/run/frr/$i.pid ] ; then
pids="$pids $(cat /var/run/frr/$i.pid)"
diff --git a/tools/etc/rsyslog.d/45-frr.conf b/tools/etc/rsyslog.d/45-frr.conf
index 75b20d76bc..ef37d66d82 100644
--- a/tools/etc/rsyslog.d/45-frr.conf
+++ b/tools/etc/rsyslog.d/45-frr.conf
@@ -11,6 +11,7 @@ if $programname == 'babeld' or
$programname == 'isisd' or
$programname == 'fabricd' or
$programname == 'ldpd' or
+ $programname == 'mgmtd' or
$programname == 'nhrpd' or
$programname == 'ospf6d' or
$programname == 'ospfd' or
@@ -33,6 +34,7 @@ if $programname == 'babeld' or
$programname == 'isisd' or
$programname == 'fabricd' or
$programname == 'ldpd' or
+ $programname == 'mgmtd' or
$programname == 'nhrpd' or
$programname == 'ospf6d' or
$programname == 'ospfd' or