[CalendarServer-changes] [15634] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Mon May 23 12:37:47 PDT 2016


Revision: 15634
          http://trac.calendarserver.org//changeset/15634
Author:   sagen at apple.com
Date:     2016-05-23 12:37:47 -0700 (Mon, 23 May 2016)
Log Message:
-----------
Get latest twext with LDAP batching and time-threshold logging

Modified Paths:
--------------
    CalendarServer/trunk/requirements-cs.txt
    CalendarServer/trunk/twistedcaldav/stdconfig.py
    CalendarServer/trunk/txdav/who/util.py

Modified: CalendarServer/trunk/requirements-cs.txt
===================================================================
--- CalendarServer/trunk/requirements-cs.txt	2016-05-23 19:36:46 UTC (rev 15633)
+++ CalendarServer/trunk/requirements-cs.txt	2016-05-23 19:37:47 UTC (rev 15634)
@@ -7,7 +7,7 @@
     zope.interface==4.1.3
 	    setuptools==18.5
 
-    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15614#egg=twextpy
+    --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@15633#egg=twextpy
         cffi==1.3.0
             pycparser==2.14
         #twisted

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2016-05-23 19:36:46 UTC (rev 15633)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2016-05-23 19:37:47 UTC (rev 15634)
@@ -104,6 +104,7 @@
         "threadPoolMax": 10,
         "connectionMax": 10,
         "tries": 3,
+        "warningThresholdSeconds": 5,
     },
 }
 

Modified: CalendarServer/trunk/txdav/who/util.py
===================================================================
--- CalendarServer/trunk/txdav/who/util.py	2016-05-23 19:36:46 UTC (rev 15633)
+++ CalendarServer/trunk/txdav/who/util.py	2016-05-23 19:37:47 UTC (rev 15634)
@@ -192,7 +192,8 @@
                 },
                 threadPoolMax=params.get("threadPoolMax", 10),
                 connectionMax=params.get("connectionMax", 10),
-                tries=params.tries
+                tries=params.get("tries", 3),
+                warningThresholdSeconds=params.get("warningThresholdSeconds", 5),
             )
             ldapService = directory
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160523/a404562e/attachment-0001.html>


More information about the calendarserver-changes mailing list