Changeset 463

Timestamp:

09/29/07 17:52:54 (1 year ago)

Author:

warner@lothar.com

Message:

web: track HTTPChannels, so we can kill them at reconfig time. Closes #102

Files:

• ChangeLog (modified) (1 diff)
• buildbot/status/web/base.py (modified) (1 diff)
• buildbot/status/web/baseweb.py (modified) (4 diffs)

ChangeLog

@@ -1 +1 @@
-2007-09-29  Brian Warner  <warner@lothar.com>
+
+        * buildbot/status/web/base.py (HtmlResource.render): keep track of
+        HTTPChannels, so we can shut them down at reconfig time (when the
+        WebStatus goes away). Closes #102.
+        * buildbot/status/web/baseweb.py (WebStatus.__init__): same
+        (WebStatus.registerChannel): same
+        (WebStatus.stopService): do .loseConnection() here
-
-        * buildbot/test/test_webparts.py (Webparts.testPages): reload the

buildbot/status/web/base.py

@@ -175 +175 @@
-
-    def render(self, request):
+        # tell the WebStatus about the HTTPChannel that got opened, so they
+        # can close it if we get reconfigured and the WebStatus goes away.
+        # They keep a weakref to this, since chances are good that it will be
+        # closed by the browser or by us before we get reconfigured. See
+        # ticket #102 for details.
+        if hasattr(request, "channel"):
+            # web.distrib.Request has no .channel
+            request.site.buildbot_service.registerChannel(request.channel)
-
-        # Our pages no longer require that their URL end in a slash. Instead,

buildbot/status/web/baseweb.py

@@ -1 +1 @@
-
-
+, weakref
-from itertools import count
-
@@ -342 +342 @@
-
-    # we are not a ComparableMixin, and therefore the webserver will be
-
+
+
+
+
-
-    def __init__(self, http_port=None, distrib_port=None, allowForce=False):
@@ -410 +413 @@
-        self.template_values = {}
-
-
-
-
-
-
-
-
-
+
+
+
-
-        if self.http_port is not None:
@@ -470 +468 @@
-        """This behaves a lot like root.putChild() . """
-        self.childrenToBeAdded[name] = child_resource
+
+    def registerChannel(self, channel):
+        self.channels[channel] = 1 # weakrefs
+
+    def stopService(self):
+        for channel in self.channels:
+            try:
+                channel.transport.loseConnection()
+            except:
+                log.msg("WebStatus.stopService: error while disconnecting"
+                        " leftover clients")
+                log.err()
+        return service.MultiService.stopService(self)
-
-    def getStatus(self):