summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-05-19 15:46:32 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-05-19 15:46:32 +0000
commitdbda75ec5f98061b87cf616b468232ebc68a9133 (patch)
treef157bab2e40e63445180fe2bebf88da49a799b89 /lib/sqlalchemy
parent89a8546d00ca5f4b59179c42a05096bc49c76c65 (diff)
downloadsqlalchemy-dbda75ec5f98061b87cf616b468232ebc68a9133.tar.gz
pool_threadlocal is off by default [ticket:1049]
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/engine/strategies.py2
-rw-r--r--lib/sqlalchemy/pool.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index aab191231..aa595c8e3 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -134,7 +134,7 @@ class PlainEngineStrategy(DefaultEngineStrategy):
DefaultEngineStrategy.__init__(self, 'plain')
def pool_threadlocal(self):
- return True
+ return False
def get_engine_cls(self):
return base.Engine
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index c1b29a1d0..7a9932e8b 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -116,8 +116,9 @@ class Pool(object):
resources. Disable at your own peril.
"""
- def __init__(self, creator, recycle=-1, echo=None, use_threadlocal=True,
+ def __init__(self, creator, recycle=-1, echo=None, use_threadlocal=False,
reset_on_return=True, listeners=None):
+
self.logger = log.instance_logger(self, echoflag=echo)
# the WeakValueDictionary works more nicely than a regular dict of
# weakrefs. the latter can pile up dead reference objects which don't