X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/5016eace34b5924d752ee0eb889ce9a2f663e78e..cf98cff2a166eb35ed2c946e03f1610069bdd1d4:/nominatim/indexer/progress.py diff --git a/nominatim/indexer/progress.py b/nominatim/indexer/progress.py index 99120673..634b1fae 100644 --- a/nominatim/indexer/progress.py +++ b/nominatim/indexer/progress.py @@ -26,7 +26,7 @@ class ProgressLogger: self.done_places = 0 self.rank_start_time = datetime.now() self.log_interval = log_interval - self.next_info = INITIAL_PROGRESS if LOG.isEnabledFor(logging.INFO) else total + 1 + self.next_info = INITIAL_PROGRESS if LOG.isEnabledFor(logging.WARNING) else total + 1 def add(self, num=1): """ Mark `num` places as processed. Print a log message if the @@ -47,9 +47,9 @@ class ProgressLogger: places_per_sec = self.done_places / done_time eta = (self.total_places - self.done_places) / places_per_sec - LOG.info("Done %d in %d @ %.3f per second - %s ETA (seconds): %.2f", - self.done_places, int(done_time), - places_per_sec, self.name, eta) + LOG.warning("Done %d in %d @ %.3f per second - %s ETA (seconds): %.2f", + self.done_places, int(done_time), + places_per_sec, self.name, eta) self.next_info += int(places_per_sec) * self.log_interval @@ -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)