X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6a7e0d652b1d40a397e1c1386d500101796676c4..1821f68ca0915c0b797efdbae8b2672f9c81985f:/nominatim/tools/exec_utils.py?ds=inline diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py index 541a2b08..a81a8d6b 100644 --- a/nominatim/tools/exec_utils.py +++ b/nominatim/tools/exec_utils.py @@ -1,15 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# This file is part of Nominatim. (https://nominatim.org) +# +# Copyright (C) 2022 by the Nominatim developer community. +# For a full list of authors see the git log. """ 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 nominatim.version import version_str +from nominatim.db.connection import get_pg_env LOG = logging.getLogger() @@ -20,16 +24,16 @@ def run_legacy_script(script, *args, nominatim_env=None, throw_on_fail=False): then throw a `CalledProcessError` on a non-zero exit. """ cmd = ['/usr/bin/env', 'php', '-Cq', - nominatim_env.phplib_dir / 'admin' / script] + str(nominatim_env.phplib_dir / 'admin' / script)] cmd.extend([str(a) for a in args]) env = nominatim_env.config.get_os_env() env['NOMINATIM_DATADIR'] = str(nominatim_env.data_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 + env['NOMINATIM_DATABASE_MODULE_SRC_PATH'] = str(nominatim_env.module_dir) if not env['NOMINATIM_OSM2PGSQL_BINARY']: - env['NOMINATIM_OSM2PGSQL_BINARY'] = nominatim_env.osm2pgsql_path + env['NOMINATIM_OSM2PGSQL_BINARY'] = str(nominatim_env.osm2pgsql_path) proc = subprocess.run(cmd, cwd=str(nominatim_env.project_dir), env=env, check=throw_on_fail) @@ -38,7 +42,7 @@ def run_legacy_script(script, *args, nominatim_env=None, throw_on_fail=False): def run_api_script(endpoint, project_dir, extra_env=None, phpcgi_bin=None, params=None): - """ Execute a Nominiatim API function. + """ Execute a Nominatim API function. The function needs a project directory that contains the website directory with the scripts to be executed. The scripts will be run @@ -51,10 +55,10 @@ def run_api_script(endpoint, project_dir, extra_env=None, phpcgi_bin=None, query_string = urlencode(params or {}) env = dict(QUERY_STRING=query_string, - SCRIPT_NAME='/{}.php'.format(endpoint), - REQUEST_URI='/{}.php?{}'.format(endpoint, query_string), + SCRIPT_NAME=f'/{endpoint}.php', + REQUEST_URI=f'/{endpoint}.php?{query_string}', CONTEXT_DOCUMENT_ROOT=webdir, - SCRIPT_FILENAME='{}/{}.php'.format(webdir, endpoint), + SCRIPT_FILENAME=f'{webdir}/{endpoint}.php', HTTP_HOST='localhost', HTTP_USER_AGENT='nominatim-tool', REMOTE_ADDR='0.0.0.0', @@ -72,7 +76,9 @@ def run_api_script(endpoint, project_dir, extra_env=None, phpcgi_bin=None, else: cmd = [str(phpcgi_bin)] - proc = subprocess.run(cmd, cwd=str(project_dir), env=env, capture_output=True, + proc = subprocess.run(cmd, cwd=str(project_dir), env=env, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, check=False) if proc.returncode != 0 or proc.stderr: @@ -100,8 +106,8 @@ def run_php_server(server_address, base_dir): def run_osm2pgsql(options): """ Run osm2pgsql with the given options. """ - env = os.environ - cmd = [options['osm2pgsql'], + env = get_pg_env(options['dsn']) + cmd = [str(options['osm2pgsql']), '--hstore', '--latlon', '--slim', '--with-forward-dependencies', 'false', '--log-progress', 'true', @@ -112,34 +118,43 @@ 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])) - - cmd.append(str(options['import_file'])) + 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' + + if 'import_data' in options: + cmd.extend(('-r', 'xml', '-')) + elif isinstance(options['import_file'], list): + for fname in options['import_file']: + cmd.append(str(fname)) + else: + cmd.append(str(options['import_file'])) - subprocess.run(cmd, cwd=options.get('cwd', '.'), env=env, check=True) + subprocess.run(cmd, cwd=options.get('cwd', '.'), + input=options.get('import_data'), + env=env, check=True) 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": f"Nominatim/{version_str()}"} try: with urlrequest.urlopen(urlrequest.Request(url, headers=headers)) as response: return response.read().decode('utf-8') - except: + except Exception: LOG.fatal('Failed to load URL: %s', url) raise