goddamn fucking shit

crossbario · Sep 5, 2015 · 303d289 · 303d289
1 parent 307a0e8
commit 303d289
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/autobahn/__init__.py b/autobahn/__init__.py
@@ -24,5 +24,5 @@
 #
 ###############################################################################
 
-__version__ = "0.10.6"
+__version__ = "0.10.7"
 version = __version__  # backward compat.
diff --git a/autobahn/twisted/websocket.py b/autobahn/twisted/websocket.py
@@ -108,8 +108,21 @@ def connectionLost(self, reason):
                                    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: