proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-10-31 09:04:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
21eb1449c7
mirror_frr/tools
History
Jonas Gorski 312d5ee159 tools: make --quiet actually suppress output 
When calling daemon_stop() with --quiet and e.g. the pidfile is empty,
it won't return early since while "$fail" is set, "$2" is "--quiet", so
the if condition isn't met and it will continue executing, resulting
in error messages in the log:

> Sep 14 14:48:33 localhost watchfrr[2085]: [YFT0P-5Q5YX] Forked background command [pid 2086]: /usr/lib/frr/watchfrr.sh restart all
> Sep 14 14:48:33 localhost frrinit.sh[2075]: /usr/lib/frr/frrcommon.sh: line 216: kill: `': not a pid or valid job spec
> Sep 14 14:48:33 localhost frrinit.sh[2075]: /usr/lib/frr/frrcommon.sh: line 216: kill: `': not a pid or valid job spec
> Sep 14 14:48:33 localhost frrinit.sh[2075]: /usr/lib/frr/frrcommon.sh: line 216: kill: `': not a pid or valid job spec

Fix this by moving the --quiet check into the block to log_failure_msg(),
and also add the check to all other invocations of log_*_msg() to make
--quiet properly suppress output.

Fixes: 19a99d89f0 ("tools: suppress unuseful warnings during restarting frr")
Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
2023-09-14 17:20:25 +02:00
..
coccinelle bgpd: Use route_map_result_t for route_map_apply() as return type 2022-09-20 10:45:02 +03:00
etc mgmtd: support bundle commands for mgmt daemon. 2023-09-12 01:53:04 -07:00
gcc-plugins Merge pull request #14344 from opensourcerouting/freebsd-printf-sync-20230903 2023-09-06 07:59:15 -04:00
.gitignore build: ignore frr-llvm-cg binary 2021-03-27 20:59:39 +01:00
build-debian-package.sh *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
checkpatch.pl tools: checkpatch: FRR modifications to linux checkpatch.pl 2023-06-20 01:05:30 -04:00
checkpatch.sh tools: improve checkpatch slicing 2018-08-03 17:25:14 +00:00
cocci.h tools: improve cocci.h 2020-07-14 11:27:41 +02:00
convert-fixedwidth.sh tools, doc: update checkpatch for u_int_* 2018-03-27 15:00:23 -04:00
emacs.dir-locals.el style: add format checker config that matches FRR style standards 2023-04-18 05:18:26 -04:00
fixup-deprecated.py *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
frr_babeltrace.py *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
frr-llvm-cg.c *: Convert thread_execute to event_execute 2023-03-24 08:32:17 -04:00
frr-llvm-debuginfo.cpp *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
frr-llvm-debuginfo.h *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
frr-reload tools: Add helper frr-reload shell script for clean error 2018-03-14 17:31:29 -07:00
frr-reload.py tools: fix key chain reload removal 2023-07-27 10:47:23 -03:00
frr.in tools: Set correct directory of vtysh for frr-reload.py 2023-03-24 19:38:46 +02:00
frr.service.in tools: Configure systemd to always restart FRR, regardless of exit code 2022-09-26 11:23:29 -04:00
frr.vim *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
frr@.service.in tools: Configure systemd to always restart FRR, regardless of exit code 2022-09-26 11:23:29 -04:00
frrcommon.sh.in tools: make --quiet actually suppress output 2023-09-14 17:20:25 +02:00
frrinit.sh.in tools: Ignore errors for frr reload stuff 2023-06-30 13:01:08 +03:00
gen_northbound_callbacks.c *: auto-convert to SPDX License IDs 2023-02-09 14:09:11 +01:00
gen_yang_deviations.c *: auto-convert to SPDX License IDs 2023-02-09 14:09:11 +01:00
generate_support_bundle.py *: auto-convert to SPDX License IDs 2023-02-09 14:09:11 +01:00
git-reindent-branch.py *: reformat python files 2020-10-07 17:22:26 -04:00
indent.py *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
lua.scr bgpd: Add lua match command 2018-09-26 21:21:23 -04:00
Makefile build: non-recursive watchfrr & tools 2017-09-07 16:18:50 +02:00
mrlg.txt mrlg: Remove obsolete version. 2016-05-26 01:16:28 +00:00
multiple-bgpd.sh tools: update to use FRR name 2017-07-12 13:26:22 -05:00
nhrpd-event-handler.sh *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
permutations.c *: auto-convert to SPDX License IDs 2023-02-09 14:09:11 +01:00
release_notes.py tools: Skip decorating commits with references (branch name, remote) 2022-02-04 23:24:03 +02:00
releasedate.py doc, tools: Update release dates in workflow.rst 2022-05-27 08:25:12 +03:00
render_md.py *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
rrcheck.pl tools: use standard interpreter path in all Perl scripts 2012-04-30 16:13:47 +02:00
rrlookup.pl tools: use standard interpreter path in all Perl scripts 2012-04-30 16:13:47 +02:00
start-stop-daemon.c *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
stringmangle.py *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
subdir.am tools: add frr_babeltrace.py to /usr/lib/frr 2021-10-15 10:37:02 -07:00
symalyzer.html *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
symalyzer.py *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
valgrind.supp tools: Add another valgrind suppression for libyang 2021-11-15 15:06:58 -05:00
vty_index.sh *: fix remaining vty->index & add coccinelle patch 2016-12-09 17:36:25 +01:00
watchfrr.sh.in watchfrr: build in defaults for -r/-s/-k 2019-02-19 21:34:31 +01:00
zc.pl *: manual SPDX License ID conversions 2023-02-09 14:09:07 +01:00
zebra.el Initial revision 2002-12-13 20:15:29 +00:00