[Checkins] SVN: z3c.saconfig/trunk/src/z3c/saconfig/zcml.py Reverted the pool size fixes as they resulted in test failures. Hope

[Martijn Faassen]

Log message for revision 101289:
  Reverted the pool size fixes as they resulted in test failures. Hope
  we'll get a better patch soon.
  

Changed:
  U   z3c.saconfig/trunk/src/z3c/saconfig/zcml.py

-=-
Modified: z3c.saconfig/trunk/src/z3c/saconfig/zcml.py
===================================================================
--- z3c.saconfig/trunk/src/z3c/saconfig/zcml.py	2009-06-26 12:10:54 UTC (rev 101288)
+++ z3c.saconfig/trunk/src/z3c/saconfig/zcml.py	2009-06-26 12:13:27 UTC (rev 101289)
@@ -26,24 +26,6 @@
         description=u'Enable logging statements for debugging.',
         required=False,
         default=False)
-
-    pool_size = zope.schema.Int(
-        title=u"Pool size",
-        description=u"Number of connections to keep open inside the connection pool.",
-        required=False,
-        default=5)
-        
-    pool_recycle = zope.schema.Int(
-        title=u"Pool recycle",
-        description=u"Recycle connections after the given number of seconds have passed.",
-        required=False,
-        default=-1)
-
-    pool_timeout = zope.schema.Int(
-        title=u"Pool timeout",
-        description=u"Number of seconds to wait before giving up on getting a connection from the pool.",
-        required=False,
-        default=30)
     
     setup = zope.schema.BytesLine(
         title=u'After engine creation hook',
@@ -80,11 +62,9 @@
         default="z3c.saconfig.utility.GloballyScopedSession")
 
 
-def engine(_context, url, name=u"", echo=False, setup=None, twophase=False,
-           pool_size=5, pool_recycle=-1, pool_timeout=30):
+def engine(_context, url, name=u"", echo=False, setup=None, twophase=False):
     factory = utility.EngineFactory(
-        url, echo=echo, pool_size=pool_size,
-        pool_recycle=pool_recycle, pool_timeout=pool_timeout)
+        url, echo=echo)
     
     zope.component.zcml.utility(
         _context,