X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/a08ef43e40fc940050cf962913677285b58493ef..cf98cff2a166eb35ed2c946e03f1610069bdd1d4:/nominatim/db/async_connection.py

diff --git a/nominatim/db/async_connection.py b/nominatim/db/async_connection.py
index a55612c8..a86c5bdc 100644
--- a/nominatim/db/async_connection.py
+++ b/nominatim/db/async_connection.py
@@ -33,7 +33,7 @@ class DeadlockHandler:
         self.ignore_sql_errors = ignore_sql_errors
 
     def __enter__(self):
-        pass
+        return self
 
     def __exit__(self, exc_type, exc_value, traceback):
         if __has_psycopg2_errors__:
@@ -85,7 +85,7 @@ class DBConnection:
 
         # Use a dict to hand in the parameters because async is a reserved
         # word in Python3.
-        self.conn = psycopg2.connect(**{'dsn' : self.dsn, 'async' : True})
+        self.conn = psycopg2.connect(**{'dsn': self.dsn, 'async': True})
         self.wait()
 
         self.cursor = self.conn.cursor(cursor_factory=cursor_factory)
@@ -190,10 +190,7 @@ class WorkerPool:
                     yield thread
 
             if command_stat > self.REOPEN_CONNECTIONS_AFTER:
-                for thread in self.threads:
-                    while not thread.is_done():
-                        thread.wait()
-                    thread.connect()
+                self._reconnect_threads()
                 ready = self.threads
                 command_stat = 0
             else:
@@ -202,6 +199,13 @@ class WorkerPool:
                 self.wait_time += time.time() - tstart
 
 
+    def _reconnect_threads(self):
+        for thread in self.threads:
+            while not thread.is_done():
+                thread.wait()
+            thread.connect()
+
+
     def __enter__(self):
         return self