summaryrefslogtreecommitdiff
path: root/eventlet/db_pool.py
diff options
context:
space:
mode:
authorSergey Shepelev <temotor@gmail.com>2011-10-12 18:37:38 +0300
committerSergey Shepelev <temotor@gmail.com>2011-10-12 18:37:38 +0300
commit0f8ca258b727a473ea1d48e812e702c25e5a05c1 (patch)
tree67ae20d5d3099a3f231285cae76dc0e954fcfb59 /eventlet/db_pool.py
parentf5e5b2bda7b442f0262ee1084deefcc5a1cc0694 (diff)
downloadeventlet-0f8ca258b727a473ea1d48e812e702c25e5a05c1.tar.gz
Fix db_pool .clear() when min_size > 0
Diffstat (limited to 'eventlet/db_pool.py')
-rw-r--r--eventlet/db_pool.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/eventlet/db_pool.py b/eventlet/db_pool.py
index 9874c2f..2664a95 100644
--- a/eventlet/db_pool.py
+++ b/eventlet/db_pool.py
@@ -228,7 +228,9 @@ class BaseConnectionPool(Pool):
if self._expiration_timer:
self._expiration_timer.cancel()
free_items, self.free_items = self.free_items, deque()
- for _last_used, _created_at, conn in free_items:
+ for item in free_items:
+ # Free items created using min_size>0 are not tuples.
+ conn = item[2] if isinstance(item, tuple) else item
self._safe_close(conn, quiet=True)
def __del__(self):