From 863386bc700bfdba1e07a7f4b19601a9b06d2e53 Mon Sep 17 00:00:00 2001
From: David Gardner <dagardner@nvidia.com>
Date: Wed, 13 Dec 2023 14:38:42 -0800
Subject: [PATCH] Fix stdout/stderr logging

---
 tests/conftest.py | 52 +++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index d6f32aa71a..ebd07ba7a2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -577,9 +577,10 @@ def prctl_fn():
     return prctl_fn
 
 
-def _start_camouflage(root_dir: str,
-                      host: str = "localhost",
-                      port: int = 8000) -> typing.Tuple[bool, typing.Optional[subprocess.Popen]]:
+def _start_camouflage(
+        root_dir: str,
+        host: str = "localhost",
+        port: int = 8000) -> typing.Tuple[bool, typing.Optional[subprocess.Popen], typing.Optional[typing.IO]]:
     logger = logging.getLogger(f"morpheus.{__name__}")
     startup_timeout = 10
 
@@ -598,47 +599,55 @@ def _start_camouflage(root_dir: str,
     # Actually launch camoflague
     if launch_camouflage:
         popen = None
+        console_log_fh = None
         try:
             # pylint: disable=subprocess-popen-preexec-fn,consider-using-with
+            # We currently don't have control over camouflage's console logger
+            # https://github.com/testinggospels/camouflage/issues/244
+            console_log = os.path.join(root_dir, 'console.log')
+            camouflage_log = os.path.join(root_dir, 'camouflage.log')
+            console_log_fh = open(console_log, 'w', encoding='utf-8')
             popen = subprocess.Popen(["camouflage", "--config", "config.yml"],
                                      cwd=root_dir,
-                                     stderr=subprocess.DEVNULL,
-                                     stdout=subprocess.DEVNULL,
+                                     stderr=console_log_fh,
+                                     stdout=console_log_fh,
                                      preexec_fn=_set_pdeathsig(signal.SIGTERM))
             # pylint: enable=subprocess-popen-preexec-fn,consider-using-with
 
             logger.info("Launched camouflage in %s with pid: %s", root_dir, popen.pid)
 
             def read_logs():
-                camouflage_log = os.path.join(root_dir, 'camouflage.log')
-                if os.path.exists(camouflage_log):
-                    with open(camouflage_log, 'r', encoding='utf-8') as f:
-                        return f.read()
-                return ""
+                for log_file in (console_log, camouflage_log):
+                    if os.path.exists(log_file):
+                        with open(log_file, 'r', encoding='utf-8') as f:
+                            logger.error("%s:\n%s", log_file, f.read())
 
             if not wait_for_camouflage(host=host, port=port, timeout=startup_timeout):
+                if console_log_fh is not None:
+                    console_log_fh.close()
+                read_logs()
 
                 if popen.poll() is not None:
-                    raise RuntimeError(f"camouflage server exited with status code={popen.poll()}\n{read_logs()}")
+                    raise RuntimeError(f"camouflage server exited with status code={popen.poll()}")
 
-                raise RuntimeError(f"Failed to launch camouflage server\n{read_logs()}")
+                raise RuntimeError("Failed to launch camouflage server")
 
             # Must have been started by this point
-            return (True, popen)
+            return (True, popen, console_log_fh)
 
         except Exception:
             # Log the error and rethrow
             logger.exception("Error launching camouflage")
             if popen is not None:
-                _stop_camouflage(popen)
+                _stop_camouflage(popen, console_log_fh=console_log_fh)
             raise
 
     else:
 
-        return (is_running, None)
+        return (is_running, None, None)
 
 
-def _stop_camouflage(popen: subprocess.Popen, shutdown_timeout: int = 5):
+def _stop_camouflage(popen: subprocess.Popen, shutdown_timeout: int = 5, console_log_fh: typing.IO = None):
     logger = logging.getLogger(f"morpheus.{__name__}")
 
     logger.info("Killing camouflage with pid %s", popen.pid)
@@ -655,6 +664,9 @@ def _stop_camouflage(popen: subprocess.Popen, shutdown_timeout: int = 5):
             time.sleep(sleep_time)
             elapsed_time += sleep_time
 
+    if console_log_fh is not None:
+        console_log_fh.close()
+
 
 @pytest.fixture(scope="session")
 def _triton_camouflage_is_running():
@@ -672,10 +684,10 @@ def _triton_camouflage_is_running():
     from _utils import TEST_DIRS
 
     root_dir = TEST_DIRS.mock_triton_servers_dir
-    (is_running, popen) = _start_camouflage(root_dir=root_dir, port=8000)
+    (is_running, popen, console_log_fh) = _start_camouflage(root_dir=root_dir, port=8000)
     yield is_running
     if popen is not None:
-        _stop_camouflage(popen)
+        _stop_camouflage(popen, console_log_fh=console_log_fh)
 
 
 @pytest.fixture(scope="session")
@@ -694,11 +706,11 @@ def _rest_camouflage_is_running():
     from _utils import TEST_DIRS
 
     root_dir = TEST_DIRS.mock_rest_server
-    (is_running, popen) = _start_camouflage(root_dir=root_dir, port=8080)
+    (is_running, popen, console_log_fh) = _start_camouflage(root_dir=root_dir, port=8080)
 
     yield is_running
     if popen is not None:
-        _stop_camouflage(popen)
+        _stop_camouflage(popen, console_log_fh=console_log_fh)
 
 
 @pytest.fixture(scope="function")