X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/4cb6dc01f382e9fb748efbe4517442af2274f210..c495ce097916063327460cfa2cc6e3fcccac4df2:/nominatim/tools/exec_utils.py?ds=inline diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py index 03bed986..e6b9d8d4 100644 --- a/nominatim/tools/exec_utils.py +++ b/nominatim/tools/exec_utils.py @@ -2,14 +2,12 @@ Helper functions for executing external programs. """ import logging -import os import subprocess import urllib.request as urlrequest from urllib.parse import urlencode -from psycopg2.extensions import parse_dsn - from ..version import NOMINATIM_VERSION +from ..db.connection import get_pg_env LOG = logging.getLogger() @@ -25,9 +23,9 @@ def run_legacy_script(script, *args, nominatim_env=None, throw_on_fail=False): env = nominatim_env.config.get_os_env() env['NOMINATIM_DATADIR'] = str(nominatim_env.data_dir) - env['NOMINATIM_BINDIR'] = str(nominatim_env.data_dir / 'utils') - if not env['NOMINATIM_DATABASE_MODULE_PATH']: - env['NOMINATIM_DATABASE_MODULE_PATH'] = nominatim_env.module_dir + env['NOMINATIM_SQLDIR'] = str(nominatim_env.sqllib_dir) + env['NOMINATIM_CONFIGDIR'] = str(nominatim_env.config_dir) + env['NOMINATIM_DATABASE_MODULE_SRC_PATH'] = nominatim_env.module_dir if not env['NOMINATIM_OSM2PGSQL_BINARY']: env['NOMINATIM_OSM2PGSQL_BINARY'] = nominatim_env.osm2pgsql_path @@ -90,10 +88,17 @@ def run_api_script(endpoint, project_dir, extra_env=None, phpcgi_bin=None, return 0 +def run_php_server(server_address, base_dir): + """ Run the built-in server from the given directory. + """ + subprocess.run(['/usr/bin/env', 'php', '-S', server_address], + cwd=str(base_dir), check=True) + + def run_osm2pgsql(options): """ Run osm2pgsql with the given options. """ - env = os.environ + env = get_pg_env(options['dsn']) cmd = [options['osm2pgsql'], '--hstore', '--latlon', '--slim', '--with-forward-dependencies', 'false', @@ -105,20 +110,21 @@ def run_osm2pgsql(options): ] if options['append']: cmd.append('--append') + else: + cmd.append('--create') if options['flatnode_file']: cmd.extend(('--flat-nodes', options['flatnode_file'])) - dsn = parse_dsn(options['dsn']) - if 'password' in dsn: - env['PGPASSWORD'] = dsn['password'] - if 'dbname' in dsn: - cmd.extend(('-d', dsn['dbname'])) - if 'user' in dsn: - cmd.extend(('--username', dsn['user'])) - for param in ('host', 'port'): - if param in dsn: - cmd.extend(('--' + param, dsn[param])) + for key, param in (('slim_data', '--tablespace-slim-data'), + ('slim_index', '--tablespace-slim-index'), + ('main_data', '--tablespace-main-data'), + ('main_index', '--tablespace-main-index')): + if options['tablespaces'][key]: + cmd.extend((param, options['tablespaces'][key])) + + if options.get('disable_jit', False): + env['PGOPTIONS'] = '-c jit=off -c max_parallel_workers_per_gather=0' cmd.append(str(options['import_file'])) @@ -128,7 +134,7 @@ def run_osm2pgsql(options): def get_url(url): """ Get the contents from the given URL and return it as a UTF-8 string. """ - headers = {"User-Agent" : "Nominatim/" + NOMINATIM_VERSION} + headers = {"User-Agent" : "Nominatim/{0[0]}.{0[1]}.{0[2]}-{0[3]}".format(NOMINATIM_VERSION)} try: with urlrequest.urlopen(urlrequest.Request(url, headers=headers)) as response: