Merge remote-tracking branch 'upstream/master'

[nominatim.git] / munin / nominatim_query_speed_querylog

diff --git a/munin/nominatim_query_speed_querylog b/munin/nominatim_query_speed_querylog
index 3ae92592534eb3b6c9a709f7d0273b47bc66b0b0..4bbeac6896da6e724452976e37e2a92318fe72b1 100755 (executable)
--- a/munin/nominatim_query_speed_querylog
+++ b/munin/nominatim_query_speed_querylog
@@ -4,7 +4,7 @@
 #
 # Uses the query log.
 #
 #
 # Uses the query log.
 #

-# Parameters: 
+# Parameters:

 #
 #       config   (required)
 #       autoconf (optional - used by munin-config)
 #
 #       config   (required)
 #       autoconf (optional - used by munin-config)


@@ -26,14 +26,12 @@ avgs.draw LINE
 avgs.type GAUGE
 avgs.min 0
 avgs.info Moving 5 minute average time to perform search
 avgs.type GAUGE
 avgs.min 0
 avgs.info Moving 5 minute average time to perform search

-avgs.label Average time to response

 
 avgr.label Average reverse time
 avgr.draw LINE
 avgr.type GAUGE
 avgr.min 0
 
 avgr.label Average reverse time
 avgr.draw LINE
 avgr.type GAUGE
 avgr.min 0

-avgr.info Moving 5 minute average time to perform search
-avgr.label Average time to response
+avgr.info Moving 5 minute average time to perform reverse

 
 max.label Slowest time to response
 max.draw LINE
 
 max.label Slowest time to response
 max.draw LINE


@@ -49,7 +47,7 @@ class LogFile:
     """ A query log file, unpacked. """
 
     def __init__(self, filename):
     """ 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):
         self.len = os.path.getsize(filename)
 
     def __del__(self):


@@ -130,9 +128,8 @@ class LogFile:
     def loglines(self):
         for l in self.fd:
             e = ENTRY_REGEX.match(l)
     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__':
 
 
 if __name__ == '__main__':