From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Mon, 8 Nov 2021 13:41:18 +0000 (+0100)
Subject: log_read: Just warn when file shrinks, try reading anyway
X-Git-Tag: v1.6.7~2^2~7
X-Git-Url: http://developer.intra2net.com/git/?p=pyi2ncommon;a=commitdiff_plain;h=9f2fbfa7b87638c08e608ecc201679df3aea8fb4

log_read: Just warn when file shrinks, try reading anyway
---

diff --git a/src/log_read.py b/src/log_read.py
index ad5d405..c6b646e 100644
--- a/src/log_read.py
+++ b/src/log_read.py
@@ -210,7 +210,6 @@ class IterativeReader(object):
                     enumerate(zip(self.file_objs, self.file_descs,
                                   self.descriptions, self.last_sizes,
                                   self.ignore)):
-
                 if do_ignore:
                     continue
 
@@ -225,11 +224,11 @@ class IterativeReader(object):
                              .format(file_desc, description),
                              category=LogReadWarning)
                         self.ignore[idx] = True
-                elif new_size < last_size:
-                    warn('{0} / {1} has become smaller ({2} --> {3})!'
-                         .format(obj, description, last_size, new_size),
-                         category=LogReadWarning)
-                else:   # (new_size > last_size)
+                else:
+                    if new_size < last_size:
+                        warn('{0} / {1} has become smaller ({2} --> {3})!'
+                             .format(obj, description, last_size, new_size),
+                             category=LogReadWarning)
                     try:
                         new_data = obj.read()
                     except OSError as ose:    # includes IOErrors