]> git.openstreetmap.org Git - nominatim.git/blobdiff - nominatim/nominatim.py
fix formatting
[nominatim.git] / nominatim / nominatim.py
index bbda4d7e28f224757c9ec6e99582e2b0f0f449bd..54d9b2085db36c3e5fe840228253a45d690ff2e8 100755 (executable)
@@ -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