openstack/fuel-qa
Code Issues Proposed changes

Output log file names when printing parsed lines

Browse Source 
Change-Id: Ic4d2346f15e9bb3520648231c6ac465157f81a6b
This commit is contained in:
Dmitry Ilyin
2016-03-29 23:08:48 +03:00
committed by Dennis Dmitriev
parent e95200b9a9
commit b89dba93c7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/jenkins/fuel_logs.py
View File

@@ -529,8 +529,12 @@ class PuppetLog(AbstractLog):
""" """
if self.enable_sort: if self.enable_sort:
self.sort_log() self.sort_log()
previous_log = None
for record in self.log: for record in self.log:
log = record.get('log', None) log = record.get('log', None)
if log and not self.enable_sort and previous_log != log:
IO.output("Log file: '{0}'".format(log))
previous_log = log
time = record.get('time', None) time = record.get('time', None)
line = record.get('line', None) line = record.get('line', None)
if not (log and time and line): if not (log and time and line):
@@ -726,7 +730,6 @@ class FuelSnapshot(object):
astute_logs.show_mcagent = show_mcagent astute_logs.show_mcagent = show_mcagent
astute_logs.show_full = show_full astute_logs.show_full = show_full
for astute_log in self.astute_logs(): for astute_log in self.astute_logs():
IO.output("Parsing Astute log: '%s'" % astute_log.name)
self.parse_log(astute_log, astute_logs) self.parse_log(astute_log, astute_logs)
astute_logs.output() astute_logs.output()
astute_logs.clear() astute_logs.clear()
@@ -748,7 +751,6 @@ class FuelSnapshot(object):
puppet_logs.enable_sort = enable_sort puppet_logs.enable_sort = enable_sort
puppet_logs.show_full = show_full puppet_logs.show_full = show_full
for puppet_log in self.puppet_logs(): for puppet_log in self.puppet_logs():
IO.output("Parsing Puppet log: '%s'" % puppet_log.name)
puppet_logs.log_name = puppet_log.name puppet_logs.log_name = puppet_log.name
self.parse_log(puppet_log, puppet_logs) self.parse_log(puppet_log, puppet_logs)
puppet_logs.output() puppet_logs.output()