Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 22000ec4c0 | |||
| 6bb276b509 |
@ -484,7 +484,7 @@ def main():
|
|||||||
proc.stderr,
|
proc.stderr,
|
||||||
select.POLLIN | select.POLLPRI | select.POLLHUP | select.POLLERR,
|
select.POLLIN | select.POLLPRI | select.POLLHUP | select.POLLERR,
|
||||||
)
|
)
|
||||||
pollc = 3
|
pollc = 2
|
||||||
# logger.debug("First poll...")
|
# logger.debug("First poll...")
|
||||||
events = poll.poll()
|
events = poll.poll()
|
||||||
# logger.debug("Done, %d event(s)", len(events))
|
# logger.debug("Done, %d event(s)", len(events))
|
||||||
@ -530,7 +530,7 @@ def main():
|
|||||||
# logger.debug("Split: %r, %r, %r", line, sep, rest)
|
# logger.debug("Split: %r, %r, %r", line, sep, rest)
|
||||||
if sep:
|
if sep:
|
||||||
stdout_logger.info(
|
stdout_logger.info(
|
||||||
line.decode(errors="replace").strip()
|
line.decode(errors="replace").rstrip()
|
||||||
)
|
)
|
||||||
stdout_line_buffer = rest
|
stdout_line_buffer = rest
|
||||||
else:
|
else:
|
||||||
@ -552,7 +552,7 @@ def main():
|
|||||||
# logger.debug("Split: %r, %r, %r", line, sep, rest)
|
# logger.debug("Split: %r, %r, %r", line, sep, rest)
|
||||||
if sep:
|
if sep:
|
||||||
stderr_logger.info(
|
stderr_logger.info(
|
||||||
line.decode(errors="replace").strip()
|
line.decode(errors="replace").rstrip()
|
||||||
)
|
)
|
||||||
stderr_line_buffer = rest
|
stderr_line_buffer = rest
|
||||||
else:
|
else:
|
||||||
@ -569,10 +569,11 @@ def main():
|
|||||||
logger.debug("STDIN closed")
|
logger.debug("STDIN closed")
|
||||||
if rfd == stdout_fd:
|
if rfd == stdout_fd:
|
||||||
logger.debug("STDOUT closed")
|
logger.debug("STDOUT closed")
|
||||||
|
pollc -= 1
|
||||||
if rfd == stderr_fd:
|
if rfd == stderr_fd:
|
||||||
logger.debug("STDERR closed")
|
logger.debug("STDERR closed")
|
||||||
|
pollc -= 1
|
||||||
poll.unregister(rfd)
|
poll.unregister(rfd)
|
||||||
pollc -= 1
|
|
||||||
|
|
||||||
if pollc > 0:
|
if pollc > 0:
|
||||||
# logger.debug("Poll...")
|
# logger.debug("Poll...")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user