Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[trivial] Output a peer name to log message on ssl errors #560

Merged
merged 2 commits into from Jul 14, 2012
Merged

[trivial] Output a peer name to log message on ssl errors #560

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9acb43
output a peer name to log message on ssl errors
ei-grad Jul 9, 2012
3b56036
formatting
ei-grad Jul 9, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion tornado/iostream.py
View file
Open in desktop
Expand Up @@ -650,7 +650,12 @@ def _do_ssl_handshake(self):
ssl.SSL_ERROR_ZERO_RETURN): ssl.SSL_ERROR_ZERO_RETURN):
return self.close() return self.close()
elif err.args[0] == ssl.SSL_ERROR_SSL: 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() return self.close()
raise raise
except socket.error, err: except socket.error, err:
Expand Down