introduce custom UsageError

This is a exception to be thrown when the error occures because
of bad user data. We don't want to print a full stack trace in
these cases but just tell the user what went wrong.
This commit is contained in:
Sarah Hoffmann
2021-01-30 16:20:10 +01:00
parent 45ea73913f
commit e629a175ed
11 changed files with 45 additions and 20 deletions

View File

@@ -11,6 +11,7 @@ from osmium import WriteHandler
from ..db import status
from .exec_utils import run_osm2pgsql
from ..errors import UsageError
LOG = logging.getLogger()
@@ -31,7 +32,7 @@ def init_replication(conn, base_url):
LOG.fatal("Cannot reach the configured replication service '%s'.\n"
"Does the URL point to a directory containing OSM update data?",
base_url)
raise RuntimeError("Failed to reach replication service")
raise UsageError("Failed to reach replication service")
status.set_status(conn, date=date, seq=seq)
@@ -80,7 +81,7 @@ def update(conn, options):
if startseq is None:
LOG.error("Replication not set up. "
"Please run 'nominatim replication --init' first.")
raise RuntimeError("Replication not set up.")
raise UsageError("Replication not set up.")
if not indexed and options['indexed_only']:
LOG.info("Skipping update. There is data that needs indexing.")