set inheritability of pipes in logger

scheibelp · scheibelp · commit 31373e74602b · 2020-01-06T10:51:15.000-08:00
diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py
@@ -284,6 +284,9 @@ def __enter__(self):
         # OS-level pipe for redirecting output to logger
         self.read_fd, self.write_fd = os.pipe()
 
+        os.set_inheritable(self.read_fd, True)
+        os.set_inheritable(self.write_fd, True)
+
         # Multiprocessing pipe for communication back from the daemon
         # Currently only used to save echo value between uses
         self.parent, self.child = multiprocessing.Pipe()
@@ -292,19 +295,19 @@ def __enter__(self):
         try:
             # need to pass this b/c multiprocessing closes stdin in child.
             try:
-                input_stream = os.fdopen(os.dup(sys.stdin.fileno()))
+                input_fd = os.dup(sys.stdin.fileno())
             except BaseException:
-                input_stream = None  # just don't forward input if this fails
+                input_fd = None  # just don't forward input if this fails
 
             self.process = multiprocessing.Process(
-                target=self._writer_daemon, args=(input_stream,))
+                target=self._writer_daemon, args=(input_fd,))
             self.process.daemon = True  # must set before start()
             self.process.start()
             os.close(self.read_fd)  # close in the parent process
 
         finally:
-            if input_stream:
-                input_stream.close()
+            if input_fd:
+                os.close(input_fd)
 
         # Flush immediately before redirecting so that anything buffered
         # goes to the original stream
@@ -412,12 +415,13 @@ def force_echo(self):
         sys.stdout.write(xoff)
         sys.stdout.flush()
 
-    def _writer_daemon(self, stdin):
+    def _writer_daemon(self, input_fd):
         """Daemon that writes output to the log file and stdout."""
         # Use line buffering (3rd param = 1) since Python 3 has a bug
         # that prevents unbuffered text I/O.
         in_pipe = os.fdopen(self.read_fd, 'r', 1)
         os.close(self.write_fd)
+        stdin = os.fdopen(input_fd)
 
         echo = self.echo        # initial echo setting, user-controllable
         force_echo = False      # parent can force echo for certain output
