add function to set up libpq environment

Instead of parsing the DSN for each external libpq program we
are going to execute, provide a function that feeds them all
necessary parameters through the environment.

osm2pgsql is the first user.
This commit is contained in:
Sarah Hoffmann
2021-02-23 14:11:11 +01:00
parent e520613362
commit af7226393a
3 changed files with 77 additions and 15 deletions

View File

@@ -10,6 +10,7 @@ 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()
@@ -100,7 +101,7 @@ def run_php_server(server_address, base_dir):
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',
@@ -116,17 +117,6 @@ def run_osm2pgsql(options):
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]))
if options.get('disable_jit', False):
env['PGOPTIONS'] = '-c jit=off -c max_parallel_workers_per_gather=0'