Better logging + cleanup.

[python_utils.git] / config.py

diff --git a/config.py b/config.py
index b2e62c0d0a6e0893e372c8d3334868f2de4ed5ee..bea701837c520ca86d584f9b48cead98ab06e838 100644 (file)
--- a/config.py
+++ b/config.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+# © Copyright 2021-2022, Scott Gasch
+
 """Global configuration driven by commandline arguments, environment variables
 and saved configuration files.  This works across several modules.
 
@@ -172,7 +174,7 @@ def is_flag_already_in_argv(var: str):
     return False
 
 
-def reorder_arg_action_groups(entry_module: Optional[str]):
+def reorder_arg_action_groups_before_help(entry_module: Optional[str]):
     reordered_action_groups = []
     for grp in ARGS._action_groups:
         if entry_module is not None and entry_module in grp.title:  # type: ignore
@@ -269,7 +271,9 @@ def parse(entry_module: Optional[str]) -> Dict[str, Any]:
     # screen w/o scrolling.
     for arg in sys.argv:
         if arg in ('--help', '-h'):
-            ARGS._action_groups = reorder_arg_action_groups(entry_module)
+            if entry_module is not None:
+                entry_module = os.path.basename(entry_module)
+            ARGS._action_groups = reorder_arg_action_groups_before_help(entry_module)
 
     # Examine the environment for variables that match known flags.
     # For a flag called --example_flag the corresponding environment
@@ -327,5 +331,6 @@ def dump_config():
 def late_logging():
     """Log messages saved earlier now that logging has been initialized."""
     logger = logging.getLogger(__name__)
+    logger.debug('Original commandline was: %s', ORIG_ARGV)
     for _ in SAVED_MESSAGES:
         logger.debug(_)