infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 7 Projects Releases Packages Wiki Activity Actions

logview: minor pep8 fixups

Browse source 
Signed-off-by: Francois Andrieu <naolwen@gmail.com>
This commit is contained in:
Francois Andrieu 2020-07-10 06:12:04 +02:00 • committed by kevin
parent 3696752d08
commit 777637f7a6
1 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/logview
View file

@ -49,10 +49,11 @@ def parse_args(args):
opts.search_terms = search_terms opts.search_terms = search_terms
return opts, args return opts, args
def search_logs(opts, logfiles): def search_logs(opts, logfiles):
msg = '' msg = ''
for fn in sorted(logfiles): for fn in sorted(logfiles):
hostname=os.path.basename(fn).replace('.log', '') hostname = os.path.basename(fn).replace('.log', '')
timestamp = os.path.basename(os.path.dirname(fn)) timestamp = os.path.basename(os.path.dirname(fn))
for line in open(fn): for line in open(fn):
things = line.split('\t') things = line.split('\t')
@ -61,7 +62,7 @@ def search_logs(opts, logfiles):
continue continue
# See callback_plugins/logdetail.py for how these lines get created. # See callback_plugins/logdetail.py for how these lines get created.
#MSG_FORMAT="%(now)s\t%(count)s\t%(category)s\t%(name)s\t%(data)s\n" # MSG_FORMAT="%(now)s\t%(count)s\t%(category)s\t%(name)s\t%(data)s\n"
task_ts, count, category, name, data = things task_ts, count, category, name, data = things
if category in opts.search_terms or 'ANY' in opts.search_terms: if category in opts.search_terms or 'ANY' in opts.search_terms:
@ -93,13 +94,12 @@ def search_logs(opts, logfiles):
msg += json.dumps(slurp, indent=4) msg += json.dumps(slurp, indent=4)
msg += '\n' msg += '\n'
return msg return msg
def main(args): def main(args):
opts,args = parse_args(args) opts, args = parse_args(args)
for pb in glob.glob(os.path.join(logpath,opts.playbook)): for pb in glob.glob(os.path.join(logpath, opts.playbook)):
pb_name = os.path.basename(pb) pb_name = os.path.basename(pb)
for pb_logdir in glob.glob(os.path.join(pb, opts.datestr)): for pb_logdir in glob.glob(os.path.join(pb, opts.datestr)):
if opts.list_pb: if opts.list_pb:
@ -113,7 +113,5 @@ def main(args):
print(msg) print(msg)
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main(sys.argv[1:])) sys.exit(main(sys.argv[1:]))