output a peer name to log message on ssl errors

diff --git a/tornado/iostream.py b/tornado/iostream.py
index cfe6b1ce89ee9f4ca27312d29751f58fc26a24f7..3e5a78d4e7adf9335bdb027cfe18839a8f69201a 100644 (file)
--- a/tornado/iostream.py
+++ b/tornado/iostream.py
@@ -650,7 +650,12 @@ class SSLIOStream(IOStream):
                                  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: