fix off-by-one error in replication download

[nominatim.git] / nominatim / cli.py

diff --git a/nominatim/cli.py b/nominatim/cli.py
index 722022b500c13a514c12448c6520a221ed22f317..37bcaffbbb41e8bc96a99a7adccb8425ba8b2976 100644 (file)
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
@@ -4,6 +4,7 @@ database administration and querying.
 """
 import datetime as dt
 import os
+import socket
 import sys
 import time
 import argparse
@@ -261,11 +262,16 @@ class UpdateReplication:
                                    together with --once""")
         group.add_argument('--osm2pgsql-cache', metavar='SIZE', type=int,
                            help='Size of cache to be used by osm2pgsql (in MB)')
+        group = parser.add_argument_group('Download parameters')
+        group.add_argument('--socket-timeout', dest='socket_timeout', type=int, default=60,
+                           help='Set timeout for file downloads.')
 
     @staticmethod
     def _init_replication(args):
         from .tools import replication, refresh
 
+        socket.setdefaulttimeout(args.socket_timeout)
+
         LOG.warning("Initialising replication updates")
         conn = connect(args.config.get_libpq_dsn())
         replication.init_replication(conn, base_url=args.config.REPLICATION_URL)
@@ -330,7 +336,8 @@ class UpdateReplication:
             conn = connect(args.config.get_libpq_dsn())
             start = dt.datetime.now(dt.timezone.utc)
             state = replication.update(conn, params)
-            status.log_status(conn, start, 'import')
+            if state is not replication.UpdateState.NO_CHANGES:
+                status.log_status(conn, start, 'import')
             batchdate, _, _ = status.get_status(conn)
             conn.close()