x
/
os-log-merger
Code Issues Proposed changes

Parse message logs containining timestamps with microseconds 

Change-Id: I9ffb52dccf3c18dac5cf5dfe8c957a95301d72be
This commit is contained in:
Matthew Booth 2018-04-20 11:33:51 +01:00
parent e08b086914
commit 9dd538d2e8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oslogmerger/oslogmerger.py
View File

@ -156,6 +156,11 @@ class MsgLogParser(StrptimeParser):
return dt.replace(self.year), dt_str, data return dt.replace(self.year), dt_str, data
class MsgLogWithMicrosecondsParser(MsgLogParser):
"""Message format: Mar 13 15:19:08.525234"""
date_format = '%b %d %H:%M:%S.%f'
def make_tzinfo(name, sign, hours, minutes): def make_tzinfo(name, sign, hours, minutes):
tzoffset = int(minutes) * 60 + int(hours) * 3600 tzoffset = int(minutes) * 60 + int(hours) * 3600
if sign == '-': if sign == '-':
@ -439,6 +444,7 @@ LOG_TYPES = {
'logfiles_detect': None, 'logfiles_detect': None,
'logfiles_o': OSLogParser, 'logfiles_o': OSLogParser,
'logfiles_m': MsgLogParser, 'logfiles_m': MsgLogParser,
'logfiles_ms': MsgLogWithMicrosecondsParser,
'logfiles_t': TSLogParser, 'logfiles_t': TSLogParser,
} }
@ -759,6 +765,10 @@ one has not been provided:'
parser.add_argument('--msg-logs', '-ml', default=[], nargs='+', parser.add_argument('--msg-logs', '-ml', default=[], nargs='+',
dest='logfiles_m', metavar='file[:ALIAS]', dest='logfiles_m', metavar='file[:ALIAS]',
help='Message log files with format: Oct 15 14:11:19') help='Message log files with format: Oct 15 14:11:19')
parser.add_argument('--msg-logs-ms', '-ms', default=[], nargs='+',
dest='logfiles_ms', metavar='file[:ALIAS]',
help='Message log files with format: '
'Mar 13 15:19:08.525234')
parser.add_argument('--timestamp-logs', '-tl', default=[], nargs='+', parser.add_argument('--timestamp-logs', '-tl', default=[], nargs='+',
dest='logfiles_t', metavar='file[:ALIAS]', dest='logfiles_t', metavar='file[:ALIAS]',
help='Message log files with timestamp: [ 0.003036]') help='Message log files with timestamp: [ 0.003036]')