diff --git a/Trigger/TrigValidation/TrigValTools/bin/check_log.py b/Trigger/TrigValidation/TrigValTools/bin/check_log.py index a3ffd7ac655d350c9ac518a43c2e62dda7dd3c2b..2dd9b0a859cd2fa0b7158e3cf100b80e3ad6a501 100755 --- a/Trigger/TrigValidation/TrigValTools/bin/check_log.py +++ b/Trigger/TrigValidation/TrigValTools/bin/check_log.py @@ -71,7 +71,7 @@ fpeTracebackCont = [ ' included from : ', ' in library : ', ] -regexMap['backtrace'].extend(fpeTracebackStart) +regexMap['fpe'].extend(fpeTracebackStart) # Warning keywords regexMap['warning'] = ['WARNING '] @@ -140,12 +140,13 @@ def scanLogfile(args, logfile, ignorePattern=[]): tPattern = re.compile('|'.join(backtrace)) fpeStartPattern = re.compile('|'.join(fpeTracebackStart)) fpeContPattern = re.compile('|'.join(fpeTracebackCont)) + ignoreDict = None categories = [] if args.warnings is True: categories += ['warning'] if args.errors is True: - categories += ['error/fatal', 'prohibited', 'python error', 'backtrace'] + categories += ['error/fatal', 'prohibited', 'python error', 'fpe', 'backtrace'] igLevels = re.compile('|'.join(ignorePattern)) @@ -174,7 +175,7 @@ def scanLogfile(args, logfile, ignorePattern=[]): resultsA['backtrace'].append(line) elif fpeTracing: # Continue following FPE so long as recognised - if fpeContPattern.search(line): + if fpeStartPattern.search(line) or fpeContPattern.search(line): resultsA['fpe'].append(line) else: fpeTracing = False