From 881b6fd359664de7461be6fe21a08a8cdc0189c3 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Wed, 8 Mar 2017 06:04:48 +0000
Subject: [PATCH] Guard against all exceptions when processing a line

You never know what's in the input string, so catch all possible
failures without crashing the tool.

Related-Bug: #1672921
Change-Id: I3a518be2e6087d0a096fa3c36aa40dcad8aecb98
---
 oslogmerger/oslogmerger.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/oslogmerger/oslogmerger.py b/oslogmerger/oslogmerger.py
index 5202a59..7f43fdb 100644
--- a/oslogmerger/oslogmerger.py
+++ b/oslogmerger/oslogmerger.py
@@ -217,9 +217,9 @@ class LogFile(object):
                     return entry, new_entry
                 entry = new_entry
 
-            except ValueError:
-                # it's a non-dated line, just append to the entry
-                # extra info
+            except Exception:
+                # it's probably a non-dated line, or a garbled entry, just
+                # append to the entry extra info
                 if entry:
                     entry.append_line(line)