server.py: handle (throw away) ECONNREFUSED from the DNS server.

This might happen occasionally on a flakey network. Reported by Ed Maste.
ekool · Mar 20, 2011 · cfb2592 · cfb2592
1 parent 2e8381e
commit cfb2592
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/server.py b/server.py
@@ -119,7 +119,14 @@ def __init__(self, mux, chan, request):
         self.sock.send(request)
 
     def callback(self):
-        data = self.sock.recv(4096)
+        try:
+            data = self.sock.recv(4096)
+        except socket.error, e:
+            if e.args[0] == errno.ECONNREFUSED:
+                debug2('DNS response: ignoring ECONNREFUSED.\n')
+                return  # might have been spurious; wait for a real answer
+            else:
+                raise
         debug2('DNS response: %d bytes\n' % len(data))
         self.mux.send(self.chan, ssnet.CMD_DNS_RESPONSE, data)
         self.ok = False