x
/
os-log-merger
Code Issues Proposed changes

Merge "Guard against all exceptions when processing a line"

This commit is contained in:
Jenkins 2017-03-15 09:27:22 +00:00 committed by Gerrit Code Review
parent 733b98a8ec 881b6fd359
commit 27b28c12f2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oslogmerger/oslogmerger.py
View File

@ -217,9 +217,9 @@ class LogFile(object):
return entry, new_entry return entry, new_entry
entry = new_entry entry = new_entry
except ValueError: except Exception:
# it's a non-dated line, just append to the entry # it's probably a non-dated line, or a garbled entry, just
# extra info # append to the entry extra info
if entry: if entry:
entry.append_line(line) entry.append_line(line)