matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

tools: suppress unuseful warnings during restarting frr

Browse source 
Problem:
During restarting frr.service, it throws annoying warnings:
Cannot stop bgpd(and others): pid file not found.

Root Cause:
During restarting process, systemd uses "stop", and watchfrr
uses "restart".
Yes, watchfrr using "restart" is to avoid systemd failing to stop.
But it should be quiet.

Fix:
During restarting service, suppress these warnings from watchfrr.

Signed-off-by: anlan_cs <vic.lan@pica8.com>
This commit is contained in:
anlan_cs 2022-01-21 20:33:30 -05:00
parent 9e84443aca
commit 19a99d89f0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/frrcommon.sh.in
View file

@ -191,7 +191,7 @@ daemon_stop() {
[ -z "$fail" -a -z "$pid" ] && fail="pid file is empty" [ -z "$fail" -a -z "$pid" ] && fail="pid file is empty"
[ -n "$fail" ] || kill -0 "$pid" 2>/dev/null || fail="pid $pid not running" [ -n "$fail" ] || kill -0 "$pid" 2>/dev/null || fail="pid $pid not running"
if [ -n "$fail" ]; then if [ -n "$fail" ] && [ "$2" != "--quiet" ]; then
log_failure_msg "Cannot stop $dmninst: $fail" log_failure_msg "Cannot stop $dmninst: $fail"
return 1 return 1
fi fi
@ -262,7 +262,7 @@ all_stop() {
done done
for dmninst in $reversed; do for dmninst in $reversed; do
daemon_stop "$dmninst" & daemon_stop "$dmninst" "$1" &
pids="$pids $!" pids="$pids $!"
done done
for pid in $pids; do for pid in $pids; do
@ -350,7 +350,7 @@ frrcommon_main() {
start) all_start;; start) all_start;;
stop) all_stop;; stop) all_stop;;
restart) restart)
all_stop all_stop --quiet
all_start all_start
;; ;;
*) $cmd "$@";; *) $cmd "$@";;