summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/pool.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-06-26 18:27:32 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-06-26 18:27:32 +0000
commitbd8ee15b87a504c158ddf7b44264e3bdc3cf3d02 (patch)
tree396d2dff9bfe5849a732264309535224d4a5704b /lib/sqlalchemy/pool.py
parent3d88870e33bbfce83298c1ac7aa11004bae2d823 (diff)
downloadsqlalchemy-bd8ee15b87a504c158ddf7b44264e3bdc3cf3d02.tar.gz
fix to timeout
Diffstat (limited to 'lib/sqlalchemy/pool.py')
-rw-r--r--lib/sqlalchemy/pool.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 0feaf93bb..420e41247 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -236,7 +236,7 @@ class QueuePool(Pool):
try:
return self._pool.get(self._max_overflow > -1 and self._overflow >= self._max_overflow, self._timeout)
except Queue.Empty:
- if self._overflow >= self._max_overflow:
+ if self._max_overflow > -1 and self._overflow >= self._max_overflow:
raise exceptions.TimeoutError("QueuePool limit of size %d overflow %d reached, connection timed out" % (self.size(), self.overflow()))
self._overflow += 1
return self._creator()