aboutsummaryrefslogtreecommitdiff
path: root/ca/rpki-nanny
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-04-24 18:28:51 +0000
committerRob Austein <sra@hactrn.net>2016-04-24 18:28:51 +0000
commit7c822bf648b175fc6c5727acd6468647772762c1 (patch)
treee3d670f01a9d5b5006ae25d2c0e9c9dda6c7dc94 /ca/rpki-nanny
parent5d4f008c055ea879a0535a54ddb4f02538f08190 (diff)
Tidy new rpki-nanny capture code a bit.
svn path=/branches/tk705/; revision=6386
Diffstat (limited to 'ca/rpki-nanny')
-rwxr-xr-xca/rpki-nanny5
1 files changed, 4 insertions, 1 deletions
diff --git a/ca/rpki-nanny b/ca/rpki-nanny
index a5f5e296..a82f7501 100755
--- a/ca/rpki-nanny
+++ b/ca/rpki-nanny
@@ -241,7 +241,10 @@ if __name__ == "__main__":
os.close(logger_pipe[1])
with os.fdopen(logger_pipe[0]) as f:
for line in f:
- logger.warn("%s", line.rstrip())
+ logger.warn("Captured: %s", line.rstrip())
+ # Should never get here, but just in case
+ logger.error("[Unexpected EOF in stdout/stderr capture logger]")
+ sys.exit(1)
else:
os.close(logger_pipe[0])
except: