[CalendarServer-changes] [3870] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3870
          http://trac.macosforge.org/projects/calendarserver/changeset/3870
Author:   wsanchez at apple.com
Date:     2009-03-16 12:41:32 -0700 (Mon, 16 Mar 2009)
Log Message:
-----------
expovariate -> randint

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/twext/web2/channel/http.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2009-03-16 18:53:46 UTC (rev 3869)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2009-03-16 19:41:32 UTC (rev 3870)
@@ -678,7 +678,7 @@
             maxRequests = config.MaxRequests,
             retryAfter = config.HTTPRetryAfter,
             betweenRequestsTimeOut = config.IdleConnectionTimeOut,
-            expovariate = True,
+            vary = True,
         )
 
         def updateChannel(config, items):

Modified: CalendarServer/trunk/twext/web2/channel/http.py
===================================================================
--- CalendarServer/trunk/twext/web2/channel/http.py	2009-03-16 18:53:46 UTC (rev 3869)
+++ CalendarServer/trunk/twext/web2/channel/http.py	2009-03-16 19:41:32 UTC (rev 3870)
@@ -14,7 +14,7 @@
 # limitations under the License.
 ##
 
-from random import expovariate
+from random import randint
 
 from twisted.internet import protocol
 from twisted.python import log
@@ -55,16 +55,14 @@
     """
     Factory for HTTP server which emits a 503 response when overloaded.
     """
-    def __init__(self, requestFactory, maxRequests=600, retryAfter=0, expovariate=False, **kwargs):
+    def __init__(self, requestFactory, maxRequests=600, retryAfter=0, vary=False, **kwargs):
         self.retryAfter = retryAfter
-        self.expovariate = expovariate
+        self.vary = vary
         HTTPFactory.__init__(self, requestFactory, maxRequests, **kwargs)
 
     def buildProtocol(self, addr):
-        if self.expovariate:
-            retryAfter = int(expovariate(1.0/self.retryAfter))
-            if retryAfter > 2 * self.retryAfter:
-                retryAfter = self.retryAfter
+        if self.vary:
+            retryAfter = randint(int(self.retryAfter * 1/2), int(self.retryAfter * 3/2))
         else:
             retryAfter = self.retryAfter
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090316/3fe27b28/attachment-0001.html>