hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

reintroduce timeout for replication file download

Browse Source 
This ports the --socket-timeout parameter from
pyosmium-get-changes which ensures that the update
process eventually times out on hanging network connections.
This commit is contained in:
Sarah Hoffmann
2021-02-04 11:47:11 +01:00
parent 6cc06828db
commit 948217d5e9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nominatim/cli.py
View File

@@ -4,6 +4,7 @@ database administration and querying.
""" """
import datetime as dt import datetime as dt
import os import os
import socket
import sys import sys
import time import time
import argparse import argparse
@@ -261,11 +262,16 @@ class UpdateReplication:
together with --once""") together with --once""")
group.add_argument('--osm2pgsql-cache', metavar='SIZE', type=int, group.add_argument('--osm2pgsql-cache', metavar='SIZE', type=int,
help='Size of cache to be used by osm2pgsql (in MB)') 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 @staticmethod
def _init_replication(args): def _init_replication(args):
from .tools import replication, refresh from .tools import replication, refresh
socket.setdefaulttimeout(args.socket_timeout)
LOG.warning("Initialising replication updates") LOG.warning("Initialising replication updates")
conn = connect(args.config.get_libpq_dsn()) conn = connect(args.config.get_libpq_dsn())
replication.init_replication(conn, base_url=args.config.REPLICATION_URL) replication.init_replication(conn, base_url=args.config.REPLICATION_URL)