From e9acb43f762d961915415d7af1ae453de01ae74d Mon Sep 17 00:00:00 2001
From: Andrew Grigorev <ei-grad@yandex-team.ru>
Date: Mon, 9 Jul 2012 14:47:51 +0400
Subject: [PATCH] output a peer name to log message on ssl errors

---
 tornado/iostream.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tornado/iostream.py b/tornado/iostream.py
index cfe6b1ce89..3e5a78d4e7 100644
--- 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: