Print warning on bad records rather than halting

1 files changed, 9 insertions, 3 deletions

diff --git a/unit_trace/trace_reader.py b/unit_trace/trace_reader.py
index e1d2095..3cbce17 100644
--- a/unit_trace/trace_reader.py
+++ b/unit_trace/trace_reader.py
@@ -125,15 +125,21 @@ def _get_file_iter(file):
             type_num = struct.unpack_from('b',data)[0]
         except struct.error:
             break #We read to the end of the file
-        type = _get_type(type_num)
+        try:
+            type = _get_type(type_num)
+        except:
+            sys.stderr.write("Skipping record with invalid type num: %d\n" %
+                (type_num))
+            continue
         try:
             values = struct.unpack_from(StHeader.format +
                 type.format,data)
             record_dict = dict(zip(type.keys,values))
         except struct.error:
             f.close()
-            print "Invalid record detected, stopping."
-            exit()
+            sys.stderr.write("Skipping record that does not match proper" +
+                " struct formatting\n")
+            continue
 
         # Convert the record_dict into an object
         record = _dict2obj(record_dict)