[Tests] Make combine_logs.py handle multi-line logs
combine_logs.py currently inserts additional newlines into multi-line log messages, and doesn't color them properly. Fix both of those.
This commit is contained in:
parent
540bf8aacc
commit
995dd89d88
1 changed files with 7 additions and 2 deletions
|
@ -79,7 +79,8 @@ def get_log_events(source, logfile):
|
|||
timestamp = time_match.group()
|
||||
# if it doesn't have a timestamp, it's a continuation line of the previous log.
|
||||
else:
|
||||
event += "\n" + line
|
||||
# Add the line. Prefix with space equivalent to the source + timestamp so log lines are aligned
|
||||
event += " " + line
|
||||
# Flush the final event
|
||||
yield LogEvent(timestamp=timestamp, source=source, event=event.rstrip())
|
||||
except FileNotFoundError:
|
||||
|
@ -98,7 +99,11 @@ def print_logs(log_events, color=False, html=False):
|
|||
colors["reset"] = "\033[0m" # Reset font color
|
||||
|
||||
for event in log_events:
|
||||
print("{0} {1: <5} {2} {3}".format(colors[event.source.rstrip()], event.source, event.event, colors["reset"]))
|
||||
lines = event.event.splitlines()
|
||||
print("{0} {1: <5} {2} {3}".format(colors[event.source.rstrip()], event.source, lines[0], colors["reset"]))
|
||||
if len(lines) > 1:
|
||||
for line in lines[1:]:
|
||||
print("{0}{1}{2}".format(colors[event.source.rstrip()], line, colors["reset"]))
|
||||
|
||||
else:
|
||||
try:
|
||||
|
|
Loading…
Reference in a new issue