Merge lp:~sidnei/txstatsd/catch-mod_wsgi-ioerror into lp:txstatsd

[Sidnei da Silva]

Catch IOError that can be raised by mod_wsgi when importing twisted.python.log

Catch IOError that can be raised by mod_wsgi when importing twisted.python.log

[Michael Nelson (michael.nelson)]

Thanks Sidnei - I'm not sure I can vote officially, but +1 :D.

review: Approve

[Anthony Lenton (elachuni)]

review: Approve

=== modified file 'txstatsd/client.py'
--- txstatsd/client.py	2012-07-27 12:05:50 +0000
+++ txstatsd/client.py	2013-01-08 14:56:25 +0000
@@ -23,14 +23,21 @@
 
 try:
     import twisted
-except ImportError:
-    # If twisted is missing, still provide the non-twisted client
-    pass
-else:
     from txstatsd.protocol import (
         StatsDClientProtocol,
         TwistedStatsDClient,
     )
+except (ImportError, IOError):
+    # If twisted is missing, still provide the non-twisted client.
+    #
+    # The IOError happens when running code from mod_wsgi, manifested as:
+    #
+    #    IOError: ' sys.stdout access restricted by mod_wsgi'
+    #
+    # ... which can happen on certain versions of twisted, because they check
+    # for sys.stdout.encoding at the module-level of twisted.python.log. See:
+    # http://twistedmatrix.com/trac/ticket/6244 for more details.
+    pass
         
 from txstatsd.hashing import ConsistentHashRing