LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

test padding non micro timestamps

Browse source
This commit is contained in:
John Newbery 2018-08-27 14:16:33 -04:00
parent 995dd89d88
commit 16e288acdd
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/functional/combine_logs.py
View file

@ -13,7 +13,7 @@ import re
import sys import sys
# Matches on the date format at the start of the log event # Matches on the date format at the start of the log event
TIMESTAMP_PATTERN = re.compile(r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}Z") TIMESTAMP_PATTERN = re.compile(r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{6})?Z")
LogEvent = namedtuple('LogEvent', ['timestamp', 'source', 'event']) LogEvent = namedtuple('LogEvent', ['timestamp', 'source', 'event'])
@ -75,8 +75,13 @@ def get_log_events(source, logfile):
if time_match: if time_match:
if event: if event:
yield LogEvent(timestamp=timestamp, source=source, event=event.rstrip()) yield LogEvent(timestamp=timestamp, source=source, event=event.rstrip())
event = line
timestamp = time_match.group() timestamp = time_match.group()
if time_match.group(1) is None:
# timestamp does not have microseconds. Add zeroes.
timestamp_micro = timestamp.replace("Z", ".000000Z")
line = line.replace(timestamp, timestamp_micro)
timestamp = timestamp_micro
event = line
# if it doesn't have a timestamp, it's a continuation line of the previous log. # if it doesn't have a timestamp, it's a continuation line of the previous log.
else: else:
# Add the line. Prefix with space equivalent to the source + timestamp so log lines are aligned # Add the line. Prefix with space equivalent to the source + timestamp so log lines are aligned