hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure that calls to PHP legacy scripts are fatal on error

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-03-01 16:10:45 +01:00
parent 976c5e9121
commit b4f64aa770
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nominatim/clicmd/setup.py
View File

@@ -87,7 +87,8 @@ class SetupAll:
params = ['setup.php', '--create-tables', '--create-partition-tables'] params = ['setup.php', '--create-tables', '--create-partition-tables']
if args.reverse_only: if args.reverse_only:
params.append('--reverse-only') params.append('--reverse-only')
run_legacy_script(*params, nominatim_env=args) run_legacy_script(*params, nominatim_env=args,
throw_on_fail=not args.ignore_errors)
LOG.warning('Create functions (2nd pass)') LOG.warning('Create functions (2nd pass)')
with connect(args.config.get_libpq_dsn()) as conn: with connect(args.config.get_libpq_dsn()) as conn:
@@ -112,7 +113,8 @@ class SetupAll:
args.threads or psutil.cpu_count() or 1) args.threads or psutil.cpu_count() or 1)
LOG.warning('Calculate postcodes') LOG.warning('Calculate postcodes')
run_legacy_script('setup.php', '--calculate-postcodes', nominatim_env=args) run_legacy_script('setup.php', '--calculate-postcodes',
nominatim_env=args, throw_on_fail=not args.ignore_errors)
if args.continue_at is None or args.continue_at in ('load-data', 'indexing'): if args.continue_at is None or args.continue_at in ('load-data', 'indexing'):
LOG.warning('Indexing places') LOG.warning('Indexing places')
@@ -124,7 +126,7 @@ class SetupAll:
params = ['setup.php', '--create-search-indices', '--create-country-names'] params = ['setup.php', '--create-search-indices', '--create-country-names']
if args.no_updates: if args.no_updates:
params.append('--drop') params.append('--drop')
run_legacy_script(*params, nominatim_env=args) run_legacy_script(*params, nominatim_env=args, throw_on_fail=not args.ignore_errors)
webdir = args.project_dir / 'website' webdir = args.project_dir / 'website'
LOG.warning('Setup website at %s', webdir) LOG.warning('Setup website at %s', webdir)