Actually print logs from sable_services and sable_history

Author: progval

irctest/basecontrollers.py

@@ -8,9 +8,11 @@
 import shutil
 import socket
 import subprocess
+import sys
 import tempfile
 import textwrap
 import time
+import threading
 from typing import (
     IO,
     Any,
@@ -148,10 +150,39 @@ def kill(self) -> None:
                 self._own_ports.remove((hostname, port))
 
     def execute(
-        self, command: Sequence[Union[str, Path]], **kwargs: Any
+        self, command: Sequence[Union[str, Path]], proc_name: Optional[str], **kwargs: Any
     ) -> subprocess.Popen:
         output_to = None if self.debug_mode else subprocess.DEVNULL
-        return subprocess.Popen(command, stderr=output_to, stdout=output_to, **kwargs)
+        proc_name = proc_name or command[0]
+        kwargs.setdefault("stdout", output_to)
+        kwargs.setdefault("stderr", output_to)
+        stream_stdout = stream_stderr = None
+        if kwargs["stdout"] in (None, subprocess.STDOUT):
+            kwargs["stdout"] = subprocess.PIPE
+            def stream_stdout():
+                for line in proc.stdout:
+                    prefix = f"{time.time():.3f} {proc_name} ".encode()
+                    try:
+                        sys.stdout.buffer.write(prefix + line)
+                    except ValueError:
+                        # "I/O operation on closed file"
+                        pass
+        if kwargs["stderr"] in (subprocess.STDOUT, None):
+            kwargs["stdout"] = subprocess.PIPE
+            def stream_stderr():
+                for line in proc.stdout:
+                    prefix = f"{time.time():.3f} {proc_name} ".encode()
+                    try:
+                        sys.stdout.buffer.write(prefix + line)
+                    except ValueError:
+                        # "I/O operation on closed file"
+                        pass
+        proc = subprocess.Popen(command, **kwargs)
+        if stream_stdout is not None:
+            threading.Thread(target=stream_stdout, name="stream_stdout").start()
+        if stream_stderr is not None:
+            threading.Thread(target=stream_stderr, name="stream_stderr").start()
+        return proc
 
 
 class DirectoryBasedController(_BaseController):

irctest/controllers/sable.py

@@ -265,7 +265,7 @@ def certs_dir() -> Path:
             {
                 "target": "stdout",
                 "level": "trace",
-                "modules": [ "sable_history" ]
+                "modules": [ "sable" ]
             }
         ]
     }
@@ -350,7 +350,7 @@ def certs_dir() -> Path:
             {
                 "target": "stdout",
                 "level": "debug",
-                "modules": [ "sable_services" ]
+                "modules": [ "sable" ]
             }
         ]
     }
@@ -476,6 +476,7 @@ def run(
             cwd=self.directory,
             preexec_fn=os.setsid,
             env={"RUST_BACKTRACE": "1", **os.environ},
+            proc_name="sable_ircd    ",
         )
         self.pgroup_id = os.getpgid(self.proc.pid)
 
@@ -567,6 +568,7 @@ def run(self, protocol: str, server_hostname: str, server_port: int) -> None:
             cwd=self.server_controller.directory,
             preexec_fn=os.setsid,
             env={"RUST_BACKTRACE": "1", **os.environ},
+            proc_name="sable_services",
         )
         self.pgroup_id = os.getpgid(self.proc.pid)
 
@@ -610,6 +612,7 @@ def run(self, protocol: str, server_hostname: str, server_port: int) -> None:
             cwd=self.server_controller.directory,
             preexec_fn=os.setsid,
             env={"RUST_BACKTRACE": "1", **os.environ},
+            proc_name="sable_history ",
         )
         self.pgroup_id = os.getpgid(self.proc.pid)