X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/b4e6d72fde248153207b0b311af4f46ee30e5e52..3a3f9b34960ccfc0d5f87d05dfe521b1527826b6:/nominatim/nominatim.py?ds=sidebyside diff --git a/nominatim/nominatim.py b/nominatim/nominatim.py index bbda4d7e..54d9b208 100755 --- a/nominatim/nominatim.py +++ b/nominatim/nominatim.py @@ -100,7 +100,7 @@ class InterpolationRunner(object): class DBConnection(object): - """ A signle non-blocking database connection. + """ A single non-blocking database connection. """ def __init__(self, options): @@ -146,7 +146,7 @@ class DBConnection(object): return True except psycopg2.extensions.TransactionRollbackError as e: if e.pgcode == '40P01': - log.debug("Deadlock detected, retry.") + log.info("Deadlock detected (params = {}), retry.".format(self.current_params)) self.cursor.execute(self.current_query, self.current_params) else: raise @@ -175,7 +175,8 @@ class Indexer(object): if self.maxrank == 30: self.index(InterpolationRunner()) - self.index(RankRunner(30)) + + self.index(RankRunner(self.maxrank)) def index(self, obj): """ Index a single rank or table. `obj` describes the SQL to use