[CalendarServer-changes] [15484] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 15484
          http://trac.calendarserver.org//changeset/15484
Author:   sagen at apple.com
Date:     2016-03-24 10:13:21 -0700 (Thu, 24 Mar 2016)
Log Message:
-----------
Expose principal search REPORT timeout in stdconfig

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/extensions.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py	2016-03-23 00:29:51 UTC (rev 15483)
+++ CalendarServer/trunk/twistedcaldav/extensions.py	2016-03-24 17:13:21 UTC (rev 15484)
@@ -250,7 +250,7 @@
                     operand=operand,
                     recordType=recordType,
                     limitResults=clientLimit,
-                    timeoutSeconds=10
+                    timeoutSeconds=config.PrincipalSearchReportTimeout
                 )
             )
 
@@ -357,7 +357,7 @@
             tokens,
             context=context,
             limitResults=limitResults,
-            timeoutSeconds=10
+            timeoutSeconds=config.PrincipalSearchReportTimeout
         ))
 
         for record in records:

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2016-03-23 00:29:51 UTC (rev 15483)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2016-03-24 17:13:21 UTC (rev 15484)
@@ -904,9 +904,12 @@
     "MaxMultigetWithDataHrefs": 5000,
     "MaxQueryWithDataResults": 1000,
 
-    # How many results to return for principal-property-search REPORT requests
+    # How many results to return for principal search REPORT requests
     "MaxPrincipalSearchReportResults": 500,
 
+    # How many seconds to wait for principal search REPORT results
+    "PrincipalSearchReportTimeout": 10,
+
     #
     # Client fixes per user-agent match
     #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160324/143382b5/attachment.html>