Improve how executed commands are logged

ansible · Jun 29, 2023 · 3859509 · 3859509
1 parent ab80427
commit 3859509
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/molecule/provisioner/ansible_playbook.py b/src/molecule/provisioner/ansible_playbook.py
@@ -20,6 +20,7 @@
 """Ansible-Playbook Provisioner Module."""
 
 import logging
+import shlex
 import warnings
 
 from molecule import util
@@ -116,8 +117,10 @@ def execute(self, action_args=None):
             result = util.run_command(self._ansible_command, debug=self._config.debug)
 
         if result.returncode != 0:
+            from rich.markup import escape
+
             util.sysexit_with_message(
-                f"Ansible return code was {result.returncode}, command was: {result.args}",
+                f"Ansible return code was {result.returncode}, command was: [dim]{escape(shlex.join(result.args))}[/dim]",
                 result.returncode,
                 warns=warns,
             )

diff --git a/src/molecule/util.py b/src/molecule/util.py
@@ -108,7 +108,7 @@ def sysexit_with_message(
     if detail:
         detail_str = safe_dump(detail) if isinstance(detail, dict) else str(detail)
         print(detail_str)
-    LOG.critical(msg)
+    LOG.critical(msg, extra={"highlighter": False})
 
     for warn in warns:
         LOG.warning(warn.__dict__["message"].args[0])