k8s_gitlab_borg/__main__.py

@@ -484,7 +484,7 @@ def main():
                     proc.stderr,
                     select.POLLIN | select.POLLPRI | select.POLLHUP | select.POLLERR,
                 )
-                pollc = 2
+                pollc = 3
                 # logger.debug("First poll...")
                 events = poll.poll()
                 # logger.debug("Done, %d event(s)", len(events))
@@ -530,7 +530,7 @@ def main():
                                     # logger.debug("Split: %r, %r, %r", line, sep, rest)
                                     if sep:
                                         stdout_logger.info(
-                                            line.decode(errors="replace").rstrip()
+                                            line.decode(errors="replace").strip()
                                         )
                                         stdout_line_buffer = rest
                                     else:
@@ -552,7 +552,7 @@ def main():
                                     # logger.debug("Split: %r, %r, %r", line, sep, rest)
                                     if sep:
                                         stderr_logger.info(
-                                            line.decode(errors="replace").rstrip()
+                                            line.decode(errors="replace").strip()
                                         )
                                         stderr_line_buffer = rest
                                     else:
@@ -569,11 +569,10 @@ def main():
                                 logger.debug("STDIN closed")
                             if rfd == stdout_fd:
                                 logger.debug("STDOUT closed")
-                                pollc -= 1
                             if rfd == stderr_fd:
                                 logger.debug("STDERR closed")
-                                pollc -= 1
                             poll.unregister(rfd)
+                            pollc -= 1
 
                     if pollc > 0:
                         # logger.debug("Poll...")