Merge pull request tornadoweb#560 from ei-grad/master

[trivial] Output a peer name to log message on ssl errors
apenwarr · Jul 14, 2012 · b5288cf · b5288cf
2 parents 5edd8da + 3b56036
commit b5288cf
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tornado/iostream.py b/tornado/iostream.py
@@ -650,7 +650,12 @@ def _do_ssl_handshake(self):
                                  ssl.SSL_ERROR_ZERO_RETURN):
                 return self.close()
             elif err.args[0] == ssl.SSL_ERROR_SSL:
-                logging.warning("SSL Error on %d: %s", self.socket.fileno(), err)
+                try:
+                    peer = self.socket.getpeername()
+                except:
+                    peer = '(not connected)'
+                logging.warning("SSL Error on %d %s: %s",
+                                self.socket.fileno(), peer, err)
                 return self.close()
             raise
         except socket.error, err: