openstack/deb-python-eventlet
Code Issues Proposed changes

tpool: proxy __enter__, __exit__ fixes BB-158; Thanks to Eric Urban

Browse Source 
https://bitbucket.org/eventlet/eventlet/issue/158/eventlet-pooled-psycopg2-connections-wont
This commit is contained in:
Sergey Shepelev
2013-10-02 16:04:34 +04:00
parent fc8f427cbf
commit 625624b0a7
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eventlet/tpool.py
View File

@@ -168,11 +168,10 @@ class Proxy(object):
self._autowrap = autowrap self._autowrap = autowrap
self._autowrap_names = autowrap_names self._autowrap_names = autowrap_names
def __getattr__(self,attr_name): def __getattr__(self, attr_name):
f = getattr(self._obj,attr_name) f = getattr(self._obj, attr_name)
if not hasattr(f, '__call__'): if not hasattr(f, '__call__'):
if (isinstance(f, self._autowrap) or if isinstance(f, self._autowrap) or attr_name in self._autowrap_names:
attr_name in self._autowrap_names):
return Proxy(f, self._autowrap) return Proxy(f, self._autowrap)
return f return f
def doit(*args, **kwargs): def doit(*args, **kwargs):
@@ -186,7 +185,7 @@ class Proxy(object):
# doesn't use getattr to retrieve and therefore have to be defined # doesn't use getattr to retrieve and therefore have to be defined
# explicitly # explicitly
def __getitem__(self, key): def __getitem__(self, key):
return proxy_call(self._autowrap, self._obj.__getitem__, key) return proxy_call(self._autowrap, self._obj.__getitem__, key)
def __setitem__(self, key, value): def __setitem__(self, key, value):
return proxy_call(self._autowrap, self._obj.__setitem__, key, value) return proxy_call(self._autowrap, self._obj.__setitem__, key, value)
def __deepcopy__(self, memo=None): def __deepcopy__(self, memo=None):
@@ -198,6 +197,11 @@ class Proxy(object):
return Proxy(proxy_call(self._autowrap, self._obj, *a, **kw)) return Proxy(proxy_call(self._autowrap, self._obj, *a, **kw))
else: else:
return proxy_call(self._autowrap, self._obj, *a, **kw) return proxy_call(self._autowrap, self._obj, *a, **kw)
def __enter__(self):
return proxy_call(self._autowrap, self._obj.__enter__)
def __exit__(self, *exc):
return proxy_call(self._autowrap, self._obj.__exit__, *exc)
# these don't go through a proxy call, because they're likely to # these don't go through a proxy call, because they're likely to
# be called often, and are unlikely to be implemented on the # be called often, and are unlikely to be implemented on the
# wrapped object in such a way that they would block # wrapped object in such a way that they would block
@@ -260,7 +264,7 @@ def setup():
execute in main thread. Check the value of the environment \ execute in main thread. Check the value of the environment \
variable EVENTLET_THREADPOOL_SIZE.", RuntimeWarning) variable EVENTLET_THREADPOOL_SIZE.", RuntimeWarning)
for i in xrange(_nthreads): for i in xrange(_nthreads):
t = threading.Thread(target=tworker, t = threading.Thread(target=tworker,
name="tpool_thread_%s" % i) name="tpool_thread_%s" % i)
t.setDaemon(True) t.setDaemon(True)
t.start() t.start()

19
tests/db_pool_test.py
View File

@@ -1,4 +1,7 @@
"Test cases for db_pool" '''Test cases for db_pool
'''
from __future__ import with_statement
import sys import sys
import os import os
import traceback import traceback
@@ -638,11 +641,21 @@ class Psycopg2ConnectionPool(object):
del db del db
class Test01Psycopg2Tpool(Psycopg2ConnectionPool, TpoolConnectionPool, TestCase): class TestPsycopg2Base(TestCase):
__test__ = False
def test_cursor_works_as_context_manager(self):
with self.connection.cursor() as c:
c.execute('select 1')
row = c.fetchone()
assert row == (1,)
class Test01Psycopg2Tpool(Psycopg2ConnectionPool, TpoolConnectionPool, TestPsycopg2Base):
__test__ = True __test__ = True
class Test02Psycopg2Raw(Psycopg2ConnectionPool, RawConnectionPool, TestCase): class Test02Psycopg2Raw(Psycopg2ConnectionPool, RawConnectionPool, TestPsycopg2Base):
__test__ = True __test__ = True