infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

tab/space issues

Browse source
This commit is contained in:
Seth Vidal 2013-07-03 23:14:33 -04:00
parent 97a906435a
commit 0ef3ff79ad
1 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

49
scripts/show_changed
View file

@ -29,33 +29,32 @@ def parse_args(args):
opts.datestr = date_cheat(opts.datestr)
if not opts.search_terms:
opts.search_terms = search_terms
opts.search_terms = search_terms
return opts, args
def search_logs(opts, logfiles):
msg = ''
for fn in logfiles:
hostname=os.path.basename(fn).replace('.log', '')
timestamp = os.path.basename(os.path.dirname(fn))
for line in open(fn):
things = line.split('\t')
if things[2] in opts.search_terms:
slurp = json.loads(things[4])
msg += '%s\t%s\t%s\t%s\t%s\t%s' % (timestamp, hostname, things[0], things[1], things[2], things[3])
if not opts.verbose:
if type(slurp) == dict:
for term in ['task_userid', 'cmd']:
if term in slurp:
msg += '\t%s:%s' % (term, slurp.get(term, None))
msg += '\n'
else:
msg += '\n'
msg += json.dumps(slurp, indent=4)
msg += '\n'
return msg
msg = ''
for fn in logfiles:
hostname=os.path.basename(fn).replace('.log', '')
timestamp = os.path.basename(os.path.dirname(fn))
for line in open(fn):
things = line.split('\t')
if things[2] in opts.search_terms:
slurp = json.loads(things[4])
msg += '%s\t%s\t%s\t%s\t%s\t%s' % (timestamp, hostname, things[0], things[1], things[2], things[3])
if not opts.verbose:
if type(slurp) == dict:
for term in ['task_userid', 'cmd']:
if term in slurp:
msg += '\t%s:%s' % (term, slurp.get(term, None))
msg += '\n'
else:
msg += '\n'
msg += json.dumps(slurp, indent=4)
msg += '\n'
return msg
def main(args):
opts,args = parse_args(args)
@ -72,4 +71,4 @@ def main(args):
if __name__ == "__main__":
sys.exit(main(sys.argv[1:]))