From 1e00c9966ed2a5cb4a4b1075e450f5e1ce13f188 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Wed, 9 Sep 2015 14:37:58 -0300 Subject: [bug] check threadpool state before closing it Code is trying to close a closed threadpool. This raises errors on Twisted 15.4. --- client/src/leap/soledad/client/adbapi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'client/src') diff --git a/client/src/leap/soledad/client/adbapi.py b/client/src/leap/soledad/client/adbapi.py index 237159bd..77822247 100644 --- a/client/src/leap/soledad/client/adbapi.py +++ b/client/src/leap/soledad/client/adbapi.py @@ -285,7 +285,8 @@ class U1DBConnectionPool(adbapi.ConnectionPool): A final close, only called by the shutdown trigger. """ self.shutdownID = None - self.threadpool.stop() + if self.threadpool.started: + self.threadpool.stop() self.running = False for conn in self.connections.values(): self._close(conn) -- cgit v1.2.3