Changeset 694

Timestamp:

04/22/08 18:03:02 (9 months ago)

Author:

zooko@zooko.com

Message:

don't retire a missing-notification-timer until you finish accepting a slave
Previously, we retired the timer when we began accepting the slave. However, if we then detected duplicate connection and rejected one of the connections, then the resulting detach would start a new missing-notification-timer. With this patch, the missing-notification-timer that is started by detaching a connection is soon retired by the other connection leading to acceptance of the buildslave. So this probably fixes the other way that issue #211 was happening (after the previous patch that was intended to fix #211).

Files:

• buildbot/buildslave.py (modified) (2 diffs)

buildbot/buildslave.py

@@ -108 +108 @@
-        @return: a Deferred that fires with a suitable pb.IPerspective to
-                 give to the slave (i.e. 'self')"""
-
-        if self.missing_timer:
-            self.missing_timer.cancel()
-            self.missing_timer = None
-
-        if self.slave:
@@ -181 +177 @@
-            log.msg("bot attached")
-            self.messageReceivedFromSlave()
+            if self.missing_timer:
+                self.missing_timer.cancel()
+                self.missing_timer = None
+
-            return self.updateSlave()
-        d.addCallback(_accept_slave)