Changeset 481:dce8d3797246

Timestamp:

09/02/08 21:28:56 (4 months ago)

Author:

Brian Warner <warner@allmydata.com>

branch:

default

Message:

negotiate: add more information to the TubConnector? log message, to try to figure out #81

Files:

• ChangeLog (modified) (1 diff)
• foolscap/negotiate.py (modified) (3 diffs)

ChangeLog

@@ -1 +1 @@
-2008-09-02  Brian Warner  <warner@lothar.com>
+
+        * foolscap/negotiate.py (TubConnector.__repr__): add more
+        information to the repr, to help track down #81. Made TubConnector
+        a new-style class in the process, to make upcalling easier.
+        (TubConnector.checkForIdle): improve the log message
-
-        * foolscap/pb.py (Tub._log_gatherer_connected): use callRemoteOnly

foolscap/negotiate.py

@@ -1254 +1254 @@
-
-
-
+(object)
-    """I am used to make an outbound connection. I am given a target TubID
-    and a list of locationHints, and I try all of them until I establish a
@@ -1304 +1304 @@
-        self.pendingConnections = {}
-
+    def __repr__(self):
+        s = object.__repr__(self)
+        s = s[:-1]
+        s += " from %s to %s>" % (self.tub.tubID, self.target.getTubID())
+        return s
-
-    def log(self, *args, **kwargs):
@@ -1455 +1460 @@
-        # we have no more outstanding connections (either in progress or in
-        # negotiation), so this connector is finished.
-"
+ (%s)" % self
-        self.tub.connectorFinished(self)