From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Wed, 7 Dec 2016 10:20:39 +0000 (+0100)
Subject: More error handling in log_read
X-Git-Tag: v1.2~16
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=9451b2ce48333f33763962380c62569aa300f58b;p=pyi2ncommon

More error handling in log_read
---

diff --git a/src/log_read.py b/src/log_read.py
index c5c5e0a..43bda89 100644
--- a/src/log_read.py
+++ b/src/log_read.py
@@ -234,6 +234,12 @@ class IterativeReader:
                         warn('io error reading from {0} / {1}: {2})'
                              .format(obj, description, ose),
                              category=LogReadWarning)
+                        new_data = str(ose)
+                    except UnicodeDecodeError as ude:
+                        warn('unicode error reading from {0} / {1}: {2}'
+                             .format(obj, description, ude),
+                             category=LogReadWarning)
+                        new_data = str(ude)
 
                     # post-processing
                     to_yield = self.prepare_result(description, new_data, idx)