Revision

15785

Author

sagen@apple.com

Date

2016-08-03 16:21:27 -0700 (Wed, 03 Aug 2016)

Log Message

Get latest twext with new LDAP pool changes

Modified Paths

• CalendarServer/trunk/requirements-cs.txt
• CalendarServer/trunk/txdav/who/util.py

Diff

--- CalendarServer/trunk/requirements-cs.txt	2016-08-03 23:20:52 UTC (rev 15784)
+++ CalendarServer/trunk/requirements-cs.txt	2016-08-03 23:21:27 UTC (rev 15785)
@@ -7,7 +7,7 @@
     zope.interface==4.1.3
 	    setuptools==18.5
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15780#egg=twextpy
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15784#egg=twextpy
         cffi==1.7.0
             pycparser==2.14
         #twisted

--- CalendarServer/trunk/txdav/who/util.py	2016-08-03 23:20:52 UTC (rev 15784)
+++ CalendarServer/trunk/txdav/who/util.py	2016-08-03 23:21:27 UTC (rev 15785)
@@ -191,7 +191,8 @@
                     CalRecordType.address: extraFilters.get("addresses", ""),
                 },
                 threadPoolMax=params.get("threadPoolMax", 10),
-                connectionMax=params.get("connectionMax", 10),
+                authConnectionMax=params.get("authConnectionMax", 5),
+                queryConnectionMax=params.get("queryConnectionMax", 5),
                 tries=params.get("tries", 3),
                 warningThresholdSeconds=params.get("warningThresholdSeconds", 5),
             )