proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 13:27:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6387 from donaldsharp/reload

Browse Source 
tools: revert frr-reload.py remove stderr redirects"
This commit is contained in:
Donatas Abraitis 2020-05-13 09:10:06 +03:00 committed by GitHub
commit 0ad81e648e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/frr-reload.py
View File

@ -155,7 +155,7 @@ class Config(object):
try: try:
config_text = subprocess.check_output( 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 -", bindir + "/vtysh --config_dir " + confdir + " -c 'show run " + daemon + "' | /usr/bin/tail -n +4 | " + bindir + "/vtysh --config_dir " + confdir + " -m -f -",
shell=True) shell=True, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
ve = VtyshMarkException(e) ve = VtyshMarkException(e)
ve.output = e.output ve.output = e.output
@ -1136,7 +1136,7 @@ def vtysh_config_available(bindir, confdir):
try: try:
cmd = [str(bindir + '/vtysh'), '--config_dir', confdir, '-c', 'conf t'] cmd = [str(bindir + '/vtysh'), '--config_dir', confdir, '-c', 'conf t']
output = subprocess.check_output(cmd).strip() output = subprocess.check_output(cmd, stderr=subprocess.STDOUT).strip()
if 'VTY configuration is locked by other VTY' in output.decode('utf-8'): if 'VTY configuration is locked by other VTY' in output.decode('utf-8'):
print(output) print(output)
@ -1394,7 +1394,7 @@ if __name__ == '__main__':
while True: while True:
try: try:
_ = subprocess.check_output(cmd) _ = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
@ -1444,7 +1444,7 @@ if __name__ == '__main__':
fh.write(line + '\n') fh.write(line + '\n')
try: try:
subprocess.check_output([str(args.bindir + '/vtysh'), '--config_dir', args.confdir, '-f', filename]) subprocess.check_output([str(args.bindir + '/vtysh'), '--config_dir', args.confdir, '-f', filename], stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
log.warning("frr-reload.py failed due to\n%s" % e.output) log.warning("frr-reload.py failed due to\n%s" % e.output)
reload_ok = False reload_ok = False