]> git.openstreetmap.org Git - nominatim.git/commitdiff
avoid division by zero in progress meter
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 21 Mar 2021 15:47:22 +0000 (16:47 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 21 Mar 2021 15:47:22 +0000 (16:47 +0100)
On Windows systems the timer may not be accurate enough to measure
the time between init() and done(). Avoid computing statistics with
a diff time of 0 in such cases.

Fixes #2230.

nominatim/indexer/progress.py

index c9d8816be989fb99675341a512c6806efcf06465..177e67b812aef0ea05116928c214ed5434f5a622 100644 (file)
@@ -57,8 +57,14 @@ class ProgressLogger:
         """ Print final statistics about the progress.
         """
         rank_end_time = datetime.now()
-        diff_seconds = (rank_end_time-self.rank_start_time).total_seconds()
+
+        if rank_end_time == self.rank_start_time:
+            diff_seconds = 0
+            places_per_sec = self.done_places
+        else:
+            diff_seconds = (rank_end_time - self.rank_start_time).total_seconds()
+            places_per_sec = self.done_places/diff_seconds
 
         LOG.warning("Done %d/%d in %d @ %.3f per second - FINISHED %s\n",
                     self.done_places, self.total_places, int(diff_seconds),
-                    self.done_places/diff_seconds, self.name)
+                    places_per_sec, self.name)