More messing with making sure that exception tracebacks end up in the log.

diff --git a/bootstrap.py b/bootstrap.py
index a4923b4a9ce3424b80475c801dde8f93ed49b48f..1fcdec3de7f223230910bb24797a1bd68ca10134 100644 (file)
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -93,24 +93,24 @@ def handle_uncaught_exception(exc_type, exc_value, exc_tb):
         sys.__excepthook__(exc_type, exc_value, exc_tb)
         return
     else:
+        import io
+        import traceback
+
+        tb_output = io.StringIO()
+        traceback.print_tb(exc_tb, None, tb_output)
+        print(tb_output.getvalue(), file=sys.stderr)
+        logger.error(tb_output.getvalue())
+        tb_output.close()
+
+        # stdin or stderr is redirected, just do the normal thing
         if not sys.stderr.isatty() or not sys.stdin.isatty():
-            # stdin or stderr is redirected, just do the normal thing
             ORIGINAL_EXCEPTION_HOOK(exc_type, exc_value, exc_tb)
-        else:
-            # a terminal is attached and stderr is not redirected, maybe debug.
-            import io
-            import traceback
-
-            tb_output = io.StringIO()
-            traceback.print_tb(exc_tb, None, tb_output)
-            print(tb_output.getvalue(), file=sys.stderr)
-            logger.error(tb_output.getvalue())
-            tb_output.close()
 
+        else:  # a terminal is attached and stderr isn't redirected, maybe debug.
             if config.config['debug_unhandled_exceptions']:
+                logger.info("Invoking the debugger...")
                 import pdb
 
-                logger.info("Invoking the debugger...")
                 pdb.pm()
             else:
                 ORIGINAL_EXCEPTION_HOOK(exc_type, exc_value, exc_tb)