safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

factor out connection reset code

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-07-12 14:58:44 +02:00
parent 568316f07c
commit f8b5a63de3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nominatim/db/async_connection.py
View File

@@ -33,7 +33,7 @@ class DeadlockHandler:
self.ignore_sql_errors = ignore_sql_errors self.ignore_sql_errors = ignore_sql_errors
def __enter__(self): def __enter__(self):
pass return self
def __exit__(self, exc_type, exc_value, traceback): def __exit__(self, exc_type, exc_value, traceback):
if __has_psycopg2_errors__: if __has_psycopg2_errors__:
@@ -190,10 +190,7 @@ class WorkerPool:
yield thread yield thread
if command_stat > self.REOPEN_CONNECTIONS_AFTER: if command_stat > self.REOPEN_CONNECTIONS_AFTER:
for thread in self.threads: self._reconnect_threads()
while not thread.is_done():
thread.wait()
thread.connect()
ready = self.threads ready = self.threads
command_stat = 0 command_stat = 0
else: else:
@@ -202,6 +199,13 @@ class WorkerPool:
self.wait_time += time.time() - tstart 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): def __enter__(self):
return self return self