Merge pull request #71 from rundeck-plugins/fix-log-output

fix log output
rundeck-plugins · Nov 9, 2022 · c540397 · c540397
2 parents 43f0b9f + db96876
commit c540397
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/contents/container-inspect b/contents/container-inspect
@@ -52,13 +52,18 @@ p = Popen(
     stdout=PIPE,
     stderr=STDOUT
 )
+
 exitcode = p.wait()
 
-if log_level == 'DEBUG':
-    log.debug("Command execution stdout: '%s' ..." % p.stdout.read())
-    log.debug("Command execution stderr: '%s' ..." % p.stderr.read())
-else:
-    print(p.stdout.read())
+# Print lines to stdout while waiting for command to finish
+while True:
+    line = p.stdout.readline().rstrip()
+    if line:
+        print(line.decode())
+    if p.poll() is not None:
+        break
+
+exitcode = p.poll()
 
 if exitcode != 0:
     log.error('Command execution failed with exit code: %s' % str(exitcode))

diff --git a/contents/container-stats b/contents/container-stats
@@ -52,13 +52,15 @@ p = Popen(
     stdout=PIPE,
     stderr=STDOUT
 )
-exitcode = p.wait()
+# Print lines to stdout while waiting for command to finish
+while True:
+    line = p.stdout.readline().rstrip()
+    if line:
+        print(line.decode())
+    if p.poll() is not None:
+        break
 
-if log_level == 'DEBUG':
-    log.debug("Command execution stdout: '%s' ..." % p.stdout.read())
-    log.debug("Command execution stderr: '%s' ..." % p.stderr.read())
-else:
-    print(p.stdout.read())
+exitcode = p.poll()
 
 if exitcode != 0:
     log.error('Command execution failed with exit code: %s' % str(exitcode))