From: Eric S. Raymond <esr@thyrsus.com>
Date: Sun, 7 Oct 2012 16:24:36 +0000 (-0400)
Subject: Instrumentation to pin down laurentb's timeout bug.
X-Git-Tag: 1.9~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32721b014d4128f94bb51d27af856f0e8d69d60c;p=irker.git

Instrumentation to pin down laurentb's timeout bug.
---

diff --git a/irkerd b/irkerd
index 321bb5f..1fe96a1 100755
--- a/irkerd
+++ b/irkerd
@@ -185,10 +185,10 @@ class Connection:
                     # the connection rather than holding a socket open in
                     # the server forever.
                     now = time.time()
-                    if (now > self.last_xmit + XMIT_TTL \
-                           or now > self.last_ping + PING_TTL) \
-                           and self.status != "disconnected":
-                        self.irker.debug(1, "timing out inactive connection to %s at %s" % (self.servername, time.asctime()))
+                    xmit_timeout = now > self.last_xmit + XMIT_TTL
+                    ping_timeout = now > self.last_ping + PING_TTL
+                    if (xmit_timeout or ping_timeout) and self.status != "disconnected":
+                        self.irker.debug(1, "timing out connection to %s at %s (ping_timeout=%s, xmit_timeout=%s)" % (self.servername, time.asctime(), ping_timeout, xmit_timeout))
                         self.connection.context = None
                         self.connection.quit("transmission timeout")
                         self.connection.close()