uniworx/k8s-gitlab-borg
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Compare commits

base: uniworx:main
Branches Tags
uniworx:main
uniworx:v3.1.4
uniworx:v3.1.3
uniworx:v3.1.2
uniworx:v3.1.1
uniworx:v3.1.0
uniworx:v3.0.0
uniworx:v2.0.0
uniworx:v1.0.1
uniworx:v1.0.0
..
compare: uniworx:v3.1.2
Branches Tags
uniworx:main
uniworx:v3.1.4
uniworx:v3.1.3
uniworx:v3.1.2
uniworx:v3.1.1
uniworx:v3.1.0
uniworx:v3.0.0
uniworx:v2.0.0
uniworx:v1.0.1
uniworx:v1.0.0

No commits in common. "main" and "v3.1.2" have entirely different histories.
main ... v3.1.2

1 changed files with 4 additions and 5 deletions
Show Stats Expand all files Collapse all files

9
k8s_gitlab_borg/__main__.py
View File

@ -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 = 2 pollc = 3
# 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").rstrip() line.decode(errors="replace").strip()
) )
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").rstrip() line.decode(errors="replace").strip()
) )
stderr_line_buffer = rest stderr_line_buffer = rest
else: else:
@ -569,11 +569,10 @@ 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...")