mirror of
git://git.proxmox.com/git/pve-network.git
synced 2025-04-30 03:27:11 +02:00
frr: remove erroneous outfunc from frr-reload command
Prior to the upgrade to frr-pythontools 10.2.1, frr-reload.py did not print any output to STDOUT, which masked the erroneous outfunc provided in run_command. With 10.2.1 frr-reload.py now prints to STDOUT, which triggers the codepath for invoking the outfunc, leading to an error when invoking frr-reload.py. By removing the outfunc the invocation works again. In addition to fixing the regression introduced, we also now print the frr-reload.py informational output to the tasklog, which can be helpful in debugging any issues when reloading the frr configuration. Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
This commit is contained in:
parent
f49d3689d7
commit
873b1431d6
|
@ -634,7 +634,7 @@ sub reload_controller {
|
|||
|
||||
if (-e $conf_file && -e $bin_path) {
|
||||
eval {
|
||||
run_command([$bin_path, '--stdout', '--reload', $conf_file], outfunc => {}, errfunc => $err);
|
||||
run_command([$bin_path, '--stdout', '--reload', $conf_file], errfunc => $err);
|
||||
};
|
||||
if ($@) {
|
||||
warn "frr reload command fail. Restarting frr.";
|
||||
|
|
Loading…
Reference in a new issue