Merge pull request #510 from willkg/1139545-tweak-handler

[bug 1139545] Handle all exceptions
mozilla · Mar 5, 2015 · c8bd9ef · c8bd9ef
2 parents 55bbcea + 92ce3b6
commit c8bd9ef
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/fjord/wsgi_utils.py b/fjord/wsgi_utils.py
@@ -64,6 +64,8 @@ def handle_uncaught_exception(self, request, resolver, exc_info):
         except (UnicodeDecodeError, UnicodeEncodeError):
             # For binary, we say, 'BINARY CONTENT'
             postbody = 'BINARY OR NON-UTF-8 CONTENT'
+        except Exception as exc:
+            postbody = 'Error figuring out postbody %r' % exc
 
         # The logger.error generates a record which can get handled by
         # the AdminEmailHandler. Overriding all that machinery is