diff options
| author | David Lamparter <equinox@diac24.net> | 2019-08-13 18:24:11 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-12-06 15:13:32 +0100 |
| commit | 3fa139a65be70e5a81b5f078530094f09a247416 (patch) | |
| tree | 20814dd0c7f78d25632f6ddbd677a895b3bb44bd /tools | |
| parent | ospfd: use new defaults mechanism (v2) (diff) | |
| download | frr-3fa139a65be70e5a81b5f078530094f09a247416.tar.xz frr-3fa139a65be70e5a81b5f078530094f09a247416.zip | |
tools/frr-reload.py: remove stderr redirects
These make no sense. stderr=subprocess.STDOUT means that vtysh's stdout
and stderr are combined and returned by check_output. We don't expect
errors in that, and we certainly don't log them.
Leaving vtysh's stderr as stderr is perfectly fine, it'll be captured
for logging just like stderr output from frr-reload.py.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/frr-reload.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/frr-reload.py b/tools/frr-reload.py index 412cde091..3e97635df 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -155,7 +155,7 @@ class Config(object): try: config_text = subprocess.check_output( bindir + "/vtysh --config_dir " + confdir + " -c 'show run " + daemon + "' | /usr/bin/tail -n +4 | " + bindir + "/vtysh --config_dir " + confdir + " -m -f -", - shell=True, stderr=subprocess.STDOUT) + shell=True) except subprocess.CalledProcessError as e: ve = VtyshMarkException(e) ve.output = e.output @@ -1105,7 +1105,7 @@ def vtysh_config_available(bindir, confdir): try: cmd = [str(bindir + '/vtysh'), '--config_dir', confdir, '-c', 'conf t'] - output = subprocess.check_output(cmd, stderr=subprocess.STDOUT).strip() + output = subprocess.check_output(cmd).strip() if 'VTY configuration is locked by other VTY' in output.decode('utf-8'): print(output) @@ -1363,7 +1363,7 @@ if __name__ == '__main__': while True: try: - _ = subprocess.check_output(cmd, stderr=subprocess.STDOUT) + _ = subprocess.check_output(cmd) except subprocess.CalledProcessError: @@ -1408,7 +1408,7 @@ if __name__ == '__main__': fh.write(line + '\n') try: - subprocess.check_output([str(args.bindir + '/vtysh'), '--config_dir', args.confdir, '-f', filename], stderr=subprocess.STDOUT) + subprocess.check_output([str(args.bindir + '/vtysh'), '--config_dir', args.confdir, '-f', filename]) except subprocess.CalledProcessError as e: log.warning("frr-reload.py failed due to\n%s" % e.output) reload_ok = False |