From f6d7dd0840c079d0d2c2e3d8852b952462423a78 Mon Sep 17 00:00:00 2001
From: Brian Coca <bcoca@users.noreply.github.com>
Date: Thu, 16 Nov 2023 14:49:40 -0500
Subject: [PATCH] displaly. log, handle when caplevel is already taken care of
 (#82227)

reneables ansible logging
---
 lib/ansible/utils/display.py                   |  4 ++--
 test/integration/targets/ansible_log/aliases   |  2 ++
 test/integration/targets/ansible_log/logit.yml |  4 ++++
 test/integration/targets/ansible_log/runme.sh  | 12 ++++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 test/integration/targets/ansible_log/aliases
 create mode 100644 test/integration/targets/ansible_log/logit.yml
 create mode 100755 test/integration/targets/ansible_log/runme.sh

diff --git a/lib/ansible/utils/display.py b/lib/ansible/utils/display.py
index 7abacf023fe..d3c25c557f2 100644
--- a/lib/ansible/utils/display.py
+++ b/lib/ansible/utils/display.py
@@ -420,9 +420,9 @@ class Display(metaclass=Singleton):
             self._log(nocolor, color)
 
     @proxy_display
-    def _log(self, msg: str, color: str | None = None, caplevel: int = 0):
+    def _log(self, msg: str, color: str | None = None, caplevel: int | None = None):
 
-        if self.log_verbosity > caplevel:
+        if caplevel is None or self.log_verbosity > caplevel:
             msg2 = msg.lstrip('\n')
 
             lvl = logging.INFO
diff --git a/test/integration/targets/ansible_log/aliases b/test/integration/targets/ansible_log/aliases
new file mode 100644
index 00000000000..498fedd558e
--- /dev/null
+++ b/test/integration/targets/ansible_log/aliases
@@ -0,0 +1,2 @@
+shippable/posix/group4
+context/controller
diff --git a/test/integration/targets/ansible_log/logit.yml b/test/integration/targets/ansible_log/logit.yml
new file mode 100644
index 00000000000..8015726ebb4
--- /dev/null
+++ b/test/integration/targets/ansible_log/logit.yml
@@ -0,0 +1,4 @@
+- hosts: localhost
+  gather_facts: false
+  tasks:
+    - ping:
diff --git a/test/integration/targets/ansible_log/runme.sh b/test/integration/targets/ansible_log/runme.sh
new file mode 100755
index 00000000000..e390e82470f
--- /dev/null
+++ b/test/integration/targets/ansible_log/runme.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -eux
+
+ALOG=${OUTPUT_DIR}/ansilbe_log_test.log
+
+ansible-playbook logit.yml
+[ ! -f "${ALOG}" ]
+
+ANSIBLE_LOG_PATH=${ALOG} ansible-playbook logit.yml
+[ -f "${ALOG}" ]
+grep -q 'ping' "${ALOG}"