openstack
/
deb-python-autobahn
Code Issues Proposed changes

goddamn fucking shit

This commit is contained in:
Tobias Oberstein 2015-09-05 18:32:16 +02:00
parent 307a0e8a03
commit 303d289de4
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autobahn/__init__.py
View File

@ -24,5 +24,5 @@
#
###############################################################################
__version__ = "0.10.6"
__version__ = "0.10.7"
version = __version__ # backward compat.

17
autobahn/twisted/websocket.py
View File

@ -108,8 +108,21 @@ class WebSocketAdapterProtocol(twisted.internet.protocol.Protocol):
peer=self.peer)
elif isinstance(reason.value, ConnectionLost):
self.factory.log.debug("Connection to/from {peer} was lost in a non-clean fashion: {message}",
peer=self.peer, message=reason.value.args[0])
# The following is ridiculous, but the treatment of reason.value.args
# across py2/3 and tx and over various corner cases is deeply fucked up.
if hasattr(reason.value, 'message'):
message = reason.value.message
elif hasattr(reason.value, 'args') and type(reason.value.args) == tuple and len(reason.value.args) > 0:
message = reason.value.args[0]
else:
message = None
if message:
self.factory.log.debug("Connection to/from {peer} was lost in a non-clean fashion: {message}",
peer=self.peer, message=message)
else:
self.factory.log.debug("Connection to/from {peer} was lost in a non-clean fashion",
peer=self.peer)
# at least: FileDescriptorOverrun, ConnectionFdescWentAway - but maybe others as well?
else: