From 6ddb39fda342618cf0929a5b85973dfa8aa2c17c Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Tue, 8 Nov 2022 22:24:19 +0100 Subject: [PATCH] respect socket timeout also in other replication functions --- nominatim/clicmd/replication.py | 6 ++++-- nominatim/tools/replication.py | 14 ++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nominatim/clicmd/replication.py b/nominatim/clicmd/replication.py index 235817de..ad201663 100644 --- a/nominatim/clicmd/replication.py +++ b/nominatim/clicmd/replication.py @@ -76,7 +76,8 @@ class UpdateReplication: LOG.warning("Initialising replication updates") with connect(args.config.get_libpq_dsn()) as conn: - replication.init_replication(conn, base_url=args.config.REPLICATION_URL) + replication.init_replication(conn, base_url=args.config.REPLICATION_URL, + socket_timeout=args.socket_timeout) if args.update_functions: LOG.warning("Create functions") refresh.create_functions(conn, args.config, True, False) @@ -87,7 +88,8 @@ class UpdateReplication: from ..tools import replication with connect(args.config.get_libpq_dsn()) as conn: - return replication.check_for_updates(conn, base_url=args.config.REPLICATION_URL) + return replication.check_for_updates(conn, base_url=args.config.REPLICATION_URL, + socket_timeout=args.socket_timeout) def _report_update(self, batchdate: dt.datetime, diff --git a/nominatim/tools/replication.py b/nominatim/tools/replication.py index 1c46c50c..d93335b8 100644 --- a/nominatim/tools/replication.py +++ b/nominatim/tools/replication.py @@ -33,7 +33,8 @@ except ImportError as exc: LOG = logging.getLogger() -def init_replication(conn: Connection, base_url: str) -> None: +def init_replication(conn: Connection, base_url: str, + socket_timeout: int = 60) -> None: """ Set up replication for the server at the given base URL. """ LOG.info("Using replication source: %s", base_url) @@ -42,9 +43,8 @@ def init_replication(conn: Connection, base_url: str) -> None: # margin of error to make sure we get all data date -= dt.timedelta(hours=3) - repl = ReplicationServer(base_url) - - seq = repl.timestamp_to_sequence(date) + with _make_replication_server(base_url, socket_timeout) as repl: + seq = repl.timestamp_to_sequence(date) if seq is None: LOG.fatal("Cannot reach the configured replication service '%s'.\n" @@ -57,7 +57,8 @@ def init_replication(conn: Connection, base_url: str) -> None: LOG.warning("Updates initialised at sequence %s (%s)", seq, date) -def check_for_updates(conn: Connection, base_url: str) -> int: +def check_for_updates(conn: Connection, base_url: str, + socket_timeout: int = 60) -> int: """ Check if new data is available from the replication service at the given base URL. """ @@ -68,7 +69,8 @@ def check_for_updates(conn: Connection, base_url: str) -> int: "Please run 'nominatim replication --init' first.") return 254 - state = ReplicationServer(base_url).get_state_info() + with _make_replication_server(base_url, socket_timeout) as repl: + state = repl.get_state_info() if state is None: LOG.error("Cannot get state for URL %s.", base_url) -- 2.39.5