From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 20 Jul 2007 18:35:51 +0000 (+0000)
Subject: further adjustment to pool.get
X-Git-Tag: rel_0_3_10~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=794c43c5aea11228edbb645e62b54377b9937948;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

further adjustment to pool.get
---

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index cf442c9286..8670464a05 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -491,10 +491,14 @@ class QueuePool(Pool):
 
     def do_get(self):
         try:
-            return self._pool.get(self._max_overflow > -1 and self._overflow >= self._max_overflow, self._timeout)
+            wait = self._max_overflow > -1 and self._overflow >= self._max_overflow
+            return self._pool.get(wait, self._timeout)
         except Queue.Empty:
             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, timeout %d" % (self.size(), self.overflow(), self._timeout))
+                if not wait:
+                    return self.do_get()
+                else:
+                    raise exceptions.TimeoutError("QueuePool limit of size %d overflow %d reached, connection timed out, timeout %d" % (self.size(), self.overflow(), self._timeout))
 
             if self._overflow_lock is not None:
                 self._overflow_lock.acquire()