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

tools: frr-reload: log exclusively through logger

Browse Source 
In several instances a call to log.error() is preceded by a print()
for the same message. To prevent duplicate messages these print()
calls are removed.

To maintain (very) similar behaviour we add a StreamHandler to the
logger, when doing logging to a file (ie. --reload without --stdout),
which additionally sends error and above logs to STDOUT without any
metadata (exactly as they did before, with print()).

There is one subtle change - the log from Vtysh.is_config_available()
is now preceded with the "vtysh 'configure' returned" text, whereas
previously only the output from vtysh was sent to STDOUT.

Furthermore any error logs which weren't previously explicitly logged
to STDOUT will now be.

Signed-off-by: Duncan Eastoe <duncan.eastoe@att.com>
This commit is contained in:
Duncan Eastoe 2020-07-15 12:35:42 +01:00
parent 9c782ad2a4
commit 6eee4767d0
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tools/frr-reload.py
View File

@ -113,7 +113,6 @@ class Vtysh(object):
output = self('configure') output = self('configure')
if 'VTY configuration is locked by other VTY' in output: if 'VTY configuration is locked by other VTY' in output:
print(output)
log.error("vtysh 'configure' returned\n%s\n" % (output)) log.error("vtysh 'configure' returned\n%s\n" % (output))
return False return False
@ -1212,45 +1211,44 @@ if __name__ == '__main__':
else: else:
log.setLevel(args.log_level.upper()) log.setLevel(args.log_level.upper())
if args.reload and not args.stdout:
# Additionally send errors and above to STDOUT, with no metadata,
# when we are logging to a file. This specifically does not follow
# args.log_level, and is analagous to behaviour in earlier versions
# which additionally logged most errors using print().
stdout_hdlr = logging.StreamHandler(sys.stdout)
stdout_hdlr.setLevel(logging.ERROR)
stdout_hdlr.setFormatter(logging.Formatter())
log.addHandler(stdout_hdlr)
# Verify the new config file is valid # Verify the new config file is valid
if not os.path.isfile(args.filename): if not os.path.isfile(args.filename):
msg = "Filename %s does not exist" % args.filename log.error("Filename %s does not exist" % args.filename)
print(msg)
log.error(msg)
sys.exit(1) sys.exit(1)
if not os.path.getsize(args.filename): if not os.path.getsize(args.filename):
msg = "Filename %s is an empty file" % args.filename log.error("Filename %s is an empty file" % args.filename)
print(msg)
log.error(msg)
sys.exit(1) sys.exit(1)
# Verify that confdir is correct # Verify that confdir is correct
if not os.path.isdir(args.confdir): if not os.path.isdir(args.confdir):
msg = "Confdir %s is not a valid path" % args.confdir log.error("Confdir %s is not a valid path" % args.confdir)
print(msg)
log.error(msg)
sys.exit(1) sys.exit(1)
# Verify that bindir is correct # Verify that bindir is correct
if not os.path.isdir(args.bindir) or not os.path.isfile(args.bindir + '/vtysh'): if not os.path.isdir(args.bindir) or not os.path.isfile(args.bindir + '/vtysh'):
msg = "Bindir %s is not a valid path to vtysh" % args.bindir log.error("Bindir %s is not a valid path to vtysh" % args.bindir)
print(msg)
log.error(msg)
sys.exit(1) sys.exit(1)
# verify that the vty_socket, if specified, is valid # verify that the vty_socket, if specified, is valid
if args.vty_socket and not os.path.isdir(args.vty_socket): if args.vty_socket and not os.path.isdir(args.vty_socket):
msg = 'vty_socket %s is not a valid path' % args.vty_socket log.error('vty_socket %s is not a valid path' % args.vty_socket)
print(msg)
log.error(msg)
sys.exit(1) sys.exit(1)
# verify that the daemon, if specified, is valid # verify that the daemon, if specified, is valid
if args.daemon and args.daemon not in ['zebra', 'bgpd', 'fabricd', 'isisd', 'ospf6d', 'ospfd', 'pbrd', 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd']: if args.daemon and args.daemon not in ['zebra', 'bgpd', 'fabricd', 'isisd', 'ospf6d', 'ospfd', 'pbrd', 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd']:
msg = "Daemon %s is not a valid option for 'show running-config'" % args.daemon log.error("Daemon %s is not a valid option for 'show running-config'" % args.daemon)
print(msg)
log.error(msg)
sys.exit(1) sys.exit(1)
vtysh = Vtysh(args.bindir, args.confdir, args.vty_socket) vtysh = Vtysh(args.bindir, args.confdir, args.vty_socket)
@ -1269,9 +1267,7 @@ if __name__ == '__main__':
break break
if not service_integrated_vtysh_config and not args.daemon: if not service_integrated_vtysh_config and not args.daemon:
msg = "'service integrated-vtysh-config' is not configured, this is required for 'service frr reload'" log.error("'service integrated-vtysh-config' is not configured, this is required for 'service frr reload'")
print(msg)
log.error(msg)
sys.exit(1) sys.exit(1)
log.info('Called via "%s"', str(args)) log.info('Called via "%s"', str(args))