Skip to content
Snippets Groups Projects
Commit 49b53b71 authored by Sybren A. Stüvel's avatar Sybren A. Stüvel
Browse files

Send subprocess read-lines to separate logger

This allows the logging config to mask those out if required.
parent e5205687
No related branches found
No related tags found
No related merge requests found
...@@ -458,6 +458,8 @@ class AbstractSubprocessCommand(AbstractCommand): ...@@ -458,6 +458,8 @@ class AbstractSubprocessCommand(AbstractCommand):
self._log.info('Executing %s', cmd_to_log) self._log.info('Executing %s', cmd_to_log)
await self.worker.register_log('Executing %s', cmd_to_log) await self.worker.register_log('Executing %s', cmd_to_log)
line_logger = self._log.getChild('line')
self.proc = await asyncio.create_subprocess_exec( self.proc = await asyncio.create_subprocess_exec(
*args, *args,
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
...@@ -500,7 +502,7 @@ class AbstractSubprocessCommand(AbstractCommand): ...@@ -500,7 +502,7 @@ class AbstractSubprocessCommand(AbstractCommand):
'Command pid=%d produced non-UTF8 output, aborting: %s' % (pid, ex)) 'Command pid=%d produced non-UTF8 output, aborting: %s' % (pid, ex))
line = line.rstrip() line = line.rstrip()
self._log.debug('Read line pid=%d: %s', pid, line) line_logger.debug('Read line pid=%d: %s', pid, line)
processed_line = await self.process_line(line) processed_line = await self.process_line(line)
if processed_line is not None: if processed_line is not None:
await self.worker.register_log(processed_line) await self.worker.register_log(processed_line)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment