Merge pull request #9 from timvaillancourt/subprocess_popen_stall

Subprocess.Popen stall fix for Issue #8

Author: dbmurphy

MongoBackup/Common/LocalCommand.py

@@ -10,9 +10,7 @@ def __init__(self, command, command_flags=[], verbose=False):
         self.command_flags = command_flags
         self.verbose       = verbose
 
-        self.output   = ""
-        self.stdout   = None
-        self.stderr   = None
+        self.output   = []
         self._process = None
 
         self.command_line = [self.command]
@@ -22,11 +20,12 @@ def __init__(self, command, command_flags=[], verbose=False):
     def parse_output(self):
         if self._process:
             try:
-                self.stdout, self.stderr = self._process.communicate()
-                output = self.stdout.strip()
-                if output == "" and self.stderr.strip() != "":
-                    output = self.stderr.strip()
-                self.output = "\n\t".join(output.split("\n"))
+                stdout, stderr = self._process.communicate()
+                output = stdout.strip()
+                if output == "" and stderr.strip() != "":
+                    output = stderr.strip()
+                if not output == "":
+                    self.output.append("\n\t".join(output.split("\n")))
             except Exception, e:
                 raise Exception, "Error parsing output: %s" % e, None
         return self.output
@@ -35,22 +34,22 @@ def run(self):
         try:
             self._process = Popen(self.command_line, stdout=PIPE, stderr=PIPE)
             while self._process.poll() is None:
-                sleep(0.5)
+                self.parse_output()
+                sleep(0.1)
         except Exception, e:
             raise e
 
-        self.parse_output()
         if self._process.returncode != 0:
             raise Exception, "%s command failed with exit code %i! Stderr output:\n%s" % (
                 self.command,
                 self._process.returncode,
-                self.stderr.strip()
+                "\n".join(self.output)
             ), None
         elif self.verbose:
-            if self.output == "":
-                logging.debug("%s command completed" % (self.command))
+            if len(self.output) > 0:
+                logging.debug("%s command completed with output:\n\t%s" % (self.command, "\n".join(self.output)))
             else:
-                logging.debug("%s command completed with output:\n\t%s" % (self.command, self.output))
+                logging.debug("%s command completed" % (self.command))
 
     def close(self):
         if self._process: