commit 39986a63d977721c5c202448728ec2b35a1dcb7d
author showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Thu Dec 10 21:41:53 2009 +0000
committer showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Thu Dec 10 21:41:53 2009 +0000
tree cc53394a7aa4e9b454bde836c85522b33a8e1d45
parent d3496242a9b11475abd44911b7e63bdb8b9e36cb

Add prefixes [stdout] and [stderr] to logged output of subcommands, by default.  This applies both to local commands (utils.run() and friends) and remote commands (SSHHost.run(), ParamikoHost.run())  Also removed a little dead code from abstract_ssh.py.

Signed-off-by: Steve Howard <showard@google.com>


git-svn-id: http://test.kernel.org/svn/autotest/trunk@4011 592f7852-d20e-0410-864c-8624ca9c26a4

client/common_lib/utils.py

diff --git a/client/common_lib/utils.py b/client/common_lib/utils.py
index 647166c..ddbb34b 100644
--- a/client/common_lib/utils.py
+++ b/client/common_lib/utils.py
@@ -34,11 +34,16 @@
 DEFAULT_STDOUT_LEVEL = logging.DEBUG
 DEFAULT_STDERR_LEVEL = logging.ERROR
 
-def get_stream_tee_file(stream, level):
+# prefixes for logging stdout/stderr of commands
+STDOUT_PREFIX = '[stdout] '
+STDERR_PREFIX = '[stderr] '
+
+
+def get_stream_tee_file(stream, level, prefix=''):
     if stream is None:
         return _the_null_stream
     if stream is TEE_TO_LOGS:
-        return logging_manager.LoggingFile(level=level)
+        return logging_manager.LoggingFile(level=level, prefix=prefix)
     return stream
 
 
@@ -46,8 +51,10 @@
     def __init__(self, command, stdout_tee=None, stderr_tee=None, verbose=True,
                  stdin=None, stderr_level=DEFAULT_STDERR_LEVEL):
         self.command = command
-        self.stdout_tee = get_stream_tee_file(stdout_tee, DEFAULT_STDOUT_LEVEL)
-        self.stderr_tee = get_stream_tee_file(stderr_tee, stderr_level)
+        self.stdout_tee = get_stream_tee_file(stdout_tee, DEFAULT_STDOUT_LEVEL,
+                                              prefix=STDOUT_PREFIX)
+        self.stderr_tee = get_stream_tee_file(stderr_tee, stderr_level,
+                                              prefix=STDERR_PREFIX)
         self.result = CmdResult(command)
 
         # allow for easy stdin input by string, we'll let subprocess create