print nice summary after updates

diff --git a/nominatim/cli.py b/nominatim/cli.py
index 68d3cca8ea302acfb007998e2065d9b243d24cba..4873308deb19cac7da2144fc231b9c39e43561c4 100644 (file)
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
@@ -284,6 +284,18 @@ class UpdateReplication:
         conn.close()
         return ret
 
+    @staticmethod
+    def _report_update(batchdate, start_import, start_index):
+        def round_time(delta):
+            return dt.timedelta(seconds=int(delta.total_seconds()))
+
+        end = dt.datetime.now(dt.timezone.utc)
+        LOG.warning("Update completed. Import: %s. %sTotal: %s. Remaining backlog: %s.",
+                    round_time((start_index or end) - start_import),
+                    "Indexing: {} ".format(round_time(end - start_index))
+                    if start_index else '',
+                    round_time(end - start_import),
+                    round_time(end - batchdate))
 
     @staticmethod
     def _update(args):
@@ -317,10 +329,11 @@ class UpdateReplication:
             start = dt.datetime.now(dt.timezone.utc)
             state = replication.update(conn, params)
             status.log_status(conn, start, 'import')
+            batchdate, _, _ = status.get_status(conn)
             conn.close()
 
             if state is not replication.UpdateState.NO_CHANGES and args.do_index:
-                start = dt.datetime.now(dt.timezone.utc)
+                index_start = dt.datetime.now(dt.timezone.utc)
                 indexer = Indexer(args.config.get_libpq_dsn(),
                                   args.threads or 1)
                 indexer.index_boundaries(0, 30)
@@ -328,8 +341,13 @@ class UpdateReplication:
 
                 conn = connect(args.config.get_libpq_dsn())
                 status.set_indexed(conn, True)
-                status.log_status(conn, start, 'index')
+                status.log_status(conn, index_start, 'index')
                 conn.close()
+            else:
+                index_start = None
+
+            if LOG.isEnabledFor(logging.WARNING):
+                UpdateReplication._report_update(batchdate, start, index_start)
 
             if args.once:
                 break

diff --git a/test/python/test_cli.py b/test/python/test_cli.py
index c4f3ef36e3dc3c095c4eedd1d3a53e9a69c735f5..cde84759b0f6fa89d322222c50355732cbcf40a5 100644 (file)
--- a/test/python/test_cli.py
+++ b/test/python/test_cli.py
@@ -5,6 +5,7 @@ These tests just check that the various command line parameters route to the
 correct functionionality. They use a lot of monkeypatching to avoid executing
 the actual functions.
 """
+import datetime as dt
 import psycopg2
 import pytest
 import time
@@ -14,6 +15,7 @@ import nominatim.indexer.indexer
 import nominatim.tools.refresh
 import nominatim.tools.replication
 from nominatim.errors import UsageError
+from nominatim.db import status
 
 def call_nominatim(*args):
     return nominatim.cli.nominatim(module_dir='build/module',
@@ -165,14 +167,17 @@ def test_replication_update_bad_interval_for_geofabrik(monkeypatch, temp_db):
                          (nominatim.tools.replication.UpdateState.UP_TO_DATE, 0),
                          (nominatim.tools.replication.UpdateState.NO_CHANGES, 3)
                          ])
-def test_replication_update_once_no_index(monkeypatch, temp_db, status_table, state, retval):
+def test_replication_update_once_no_index(monkeypatch, temp_db, temp_db_conn,
+                                          status_table, state, retval):
+    status.set_status(temp_db_conn, date=dt.datetime.now(dt.timezone.utc), seq=1)
     func_mock = MockParamCapture(retval=state)
     monkeypatch.setattr(nominatim.tools.replication, 'update', func_mock)
 
     assert retval == call_nominatim('replication', '--once', '--no-index')
 
 
-def test_replication_update_continuous(monkeypatch, status_table):
+def test_replication_update_continuous(monkeypatch, temp_db_conn, status_table):
+    status.set_status(temp_db_conn, date=dt.datetime.now(dt.timezone.utc), seq=1)
     states = [nominatim.tools.replication.UpdateState.UP_TO_DATE,
               nominatim.tools.replication.UpdateState.UP_TO_DATE]
     monkeypatch.setattr(nominatim.tools.replication, 'update',
@@ -188,7 +193,8 @@ def test_replication_update_continuous(monkeypatch, status_table):
     assert index_mock.called == 4
 
 
-def test_replication_update_continuous_no_change(monkeypatch, status_table):
+def test_replication_update_continuous_no_change(monkeypatch, temp_db_conn, status_table):
+    status.set_status(temp_db_conn, date=dt.datetime.now(dt.timezone.utc), seq=1)
     states = [nominatim.tools.replication.UpdateState.NO_CHANGES,
               nominatim.tools.replication.UpdateState.UP_TO_DATE]
     monkeypatch.setattr(nominatim.tools.replication, 'update',