Merge remote-tracking branch 'upstream/master'

[nominatim.git] / munin / nominatim_requests_querylog

diff --git a/munin/nominatim_requests_querylog b/munin/nominatim_requests_querylog
index 7fe11bd021ffe4ee67842fc1ccdc091e5a768281..aa41a4de82f15c187a941ce5e4507867a6170917 100755 (executable)
--- a/munin/nominatim_requests_querylog
+++ b/munin/nominatim_requests_querylog
@@ -40,7 +40,7 @@ class LogFile:
     """ A query log file, unpacked. """
 
     def __init__(self, filename):
-        self.fd = open(filename)
+        self.fd = open(filename, encoding='utf-8', errors='replace')
         self.len = os.path.getsize(filename)
 
     def __del__(self):
@@ -121,9 +121,8 @@ class LogFile:
     def loglines(self):
         for l in self.fd:
             e = ENTRY_REGEX.match(l)
-            if e is None:
-                raise ValueError("Invalid log line:", l)
-            yield e.groupdict()
+            if e is not None:
+                yield e.groupdict()
 
 
 if __name__ == '__main__':