Adding option to pipe stdout and err on run command (#14)

Author: omesser

.gitignore

@@ -1,6 +1,7 @@
 *~
 *.pyc
 bin/
+venv/
 include/
 lib/
 local/

manof/image.py

@@ -1,11 +1,13 @@
 import os
+import sys
 import pipes
 import inspect
 import re
 
 from twisted.internet import defer
 
 import manof
+import utils
 
 
 class Image(manof.Target):
@@ -218,10 +220,12 @@ def run(self):
             print command
 
         try:
-            yield self._run_command(command)
-        except Exception as exc:
-            self._logger.warn('Failed running container', err=str(exc))
+            out, _, _ = yield self._run_command(command)
+
+            if self.pipe_stdout:
+                print >> sys.stdout, out
 
+        except Exception as exc:
             dangling_container_error = re.search(
                 'endpoint with name (?P<container_name>.*) already exists in network (?P<network>.*).',
                 exc.message)
@@ -231,9 +235,17 @@ def run(self):
                 network = dangling_container_error.group('network')
                 yield self._disconnect_container_from_network(container_name, network)
 
-                self._logger.debug('Reruning container', command=command)
+                self._logger.debug('Re-running container', command=command)
                 yield self._run_command(command)
+
             else:
+
+                if self.pipe_stderr:
+                    if isinstance(exc, utils.CommandFailedError):
+                        print >> sys.stderr, exc.err
+                    else:
+                        print >> sys.stderr, str(exc)
+
                 raise exc
 
     @defer.inlineCallbacks
@@ -350,6 +362,14 @@ def container_name(self):
     def command(self):
         return None
 
+    @property
+    def pipe_stdout(self):
+        return False
+
+    @property
+    def pipe_stderr(self):
+        return False
+
     @property
     def hostname(self):
         return None

manof/utils/__init__.py

@@ -22,6 +22,9 @@ def __init__(self, command=None, code=None, cwd=None, out=None, err=None, signal
         :param signal: the signal which killed the process
         :type signal: int
         """
+        self._code = code
+        self._out = out
+        self._err = err
 
         if code is not None:
             message = '\'{0}\' exited with code {1}'.format(command, code)
@@ -39,6 +42,18 @@ def __init__(self, command=None, code=None, cwd=None, out=None, err=None, signal
 
         super(CommandFailedError, self).__init__(message)
 
+    @property
+    def code(self):
+        return self._code
+
+    @property
+    def out(self):
+        return self._out
+
+    @property
+    def err(self):
+        return self._err
+
 
 def git_pull(logger, path):
     logger.debug('Pulling', **locals())
@@ -201,7 +216,7 @@ def retry_until_successful(num_of_tries, logger, function, *args, **kwargs):
     """
 
     def _on_operation_callback_error(failure):
-        logger.warn('Exception during operation execution', function=function.__name__, tb=failure.getBriefTraceback())
+        logger.debug('Exception during operation execution', function=function.__name__, tb=failure.getBriefTraceback())
         raise failure
 
     tries = 1