[CalendarServer-changes] [4575] CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/ twistedcaldav

[source_changes at macosforge.org]

Revision: 4575
          http://trac.macosforge.org/projects/calendarserver/changeset/4575
Author:   sagen at apple.com
Date:     2009-10-09 14:00:36 -0700 (Fri, 09 Oct 2009)
Log Message:
-----------
Implements MaxAccepts

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/config.py
    CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/httpfactory.py
    CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/tap.py

Modified: CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/config.py	2009-10-06 18:04:11 UTC (rev 4574)
+++ CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/config.py	2009-10-09 21:00:36 UTC (rev 4575)
@@ -263,6 +263,7 @@
 
     # Set the maximum number of outstanding requests to this server.
     "MaxRequests": 600,
+    "MaxAccepts": 100,
     "ResumeRequests": 550,
 
     "ListenBacklog": 50,

Modified: CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/httpfactory.py
===================================================================
--- CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/httpfactory.py	2009-10-06 18:04:11 UTC (rev 4574)
+++ CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/httpfactory.py	2009-10-09 21:00:36 UTC (rev 4575)
@@ -80,9 +80,10 @@
 class LimitingHTTPFactory(HTTPFactory):
     protocol = LimitingHTTPChannel
 
-    def __init__(self, requestFactory, maxRequests=600, resumeRequests=550,
+    def __init__(self, requestFactory, maxRequests=600, maxAccepts=100, resumeRequests=550,
         **kwargs):
         HTTPFactory.__init__(self, requestFactory, maxRequests, **kwargs)
+        self.maxAccepts = maxAccepts
         self.resumeRequests = resumeRequests
 
     def buildProtocol(self, addr):

Modified: CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/tap.py
===================================================================
--- CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/tap.py	2009-10-06 18:04:11 UTC (rev 4574)
+++ CalendarServer/branches/users/sagen/deployment-inherit-fds-4571/twistedcaldav/tap.py	2009-10-09 21:00:36 UTC (rev 4575)
@@ -441,7 +441,7 @@
         self.startReading()
 
     def doRead(self):
-        self.numberAccepts = self.factory.maxRequests - self.factory.outstandingRequests
+        self.numberAccepts = min(self.factory.maxRequests - self.factory.outstandingRequests, self.factory.maxAccepts)
         tcp.Port.doRead(self)
 
 
@@ -725,6 +725,7 @@
             channel = LimitingHTTPFactory(
                 site,
                 maxRequests=config.MaxRequests,
+                maxAccepts=config.MaxAccepts,
                 resumeRequests=config.ResumeRequests,
                 betweenRequestsTimeOut=config.IdleConnectionTimeOut)
 
@@ -817,6 +818,7 @@
 
         def updateChannel(config, items):
             channel.maxRequests = config.MaxRequests
+            channel.maxAccepts = config.MaxAccepts
             channel.requestsRequests = config.ResumeRequests
 
         config.addHook(updateChannel)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091009/e3dfb0ba/attachment.html>