X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=bootstrap.py;h=1fcdec3de7f223230910bb24797a1bd68ca10134;hb=47ece7bceb442d70ddcc3c728533c4d4d2bccde4;hp=9bffaf535bf48e310a2006a489ac43242c20f99a;hpb=2bf59f4f017a7497aaf0449bdf77e130abdf36d8;p=python_utils.git

diff --git a/bootstrap.py b/bootstrap.py
index 9bffaf5..1fcdec3 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -1,10 +1,14 @@
 #!/usr/bin/env python3
 
+# © Copyright 2021-2022, Scott Gasch
+
 """This is a module for wrapping around python programs and doing some
 minor setup and tear down work for them.  With it, you can break into
 pdb on unhandled top level exceptions, profile your code by passing a
 commandline argument in, audit module import events, examine where
-memory is being used in your program, and so on."""
+memory is being used in your program, and so on.
+
+"""
 
 import functools
 import importlib
@@ -89,18 +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 traceback
 
-            traceback.print_exception(exc_type, exc_value, exc_tb)
+        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)
@@ -269,6 +279,10 @@ def initialize(entry_point):
         logger.debug('Python interpreter version: %s', sys.version)
         logger.debug('Python implementation: %s', sys.implementation)
         logger.debug('Python C API version: %s', sys.api_version)
+        if __debug__:
+            logger.debug('Python interpreter running in __debug__ mode.')
+        else:
+            logger.debug('Python interpreter running in optimized mode.')
         logger.debug('Python path: %s', sys.path)
 
         # Log something about the site_config, many things use it.
@@ -313,7 +327,7 @@ def initialize(entry_point):
             with stopwatch.Timer() as t:
                 ret = entry_point(*args, **kwargs)
 
-        logger.debug('%s (program entry point) returned %s.', entry_descr)
+        logger.debug('%s (program entry point) returned %s.', entry_descr, ret)
 
         if config.config['trace_memory']:
             snapshot = tracemalloc.take_snapshot()