diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 259: * Omit the commands we send to the board from the log (as this output is

Message ID 20120319222411.22378.18548.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson March 19, 2012, 10:24 p.m. UTC 
Merge authors:
  Michael Hudson-Doyle (mwhudson)
Related merge proposals:
  https://code.launchpad.net/~mwhudson/lava-dispatcher/only-logfile_read/+merge/97788
  proposed by: Michael Hudson-Doyle (mwhudson)
  review: Approve - Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 259 [merge]
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Tue 2012-03-20 11:22:10 +1300
message:
  * Omit the commands we send to the board from the log (as this output is
  invariably echoed back and so was ending up in the output twice)
modified:
  doc/changes.rst
  lava_dispatcher/client/master.py
  lava_dispatcher/job.py


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2012-03-13 20:00:37 +0000
+++ doc/changes.rst	2012-03-19 22:21:41 +0000
@@ -5,6 +5,8 @@ 
 
 Version 0.5.10 (UNRELEASED)
 ===========================
+* Omit the commands we send to the board from the log (as this output is
+  invariably echoed back and so was ending up in the output twice)
 
 .. _version_0_5_9:
 

=== modified file 'lava_dispatcher/client/master.py'
--- lava_dispatcher/client/master.py	2012-03-15 17:13:46 +0000
+++ lava_dispatcher/client/master.py	2012-03-19 22:20:07 +0000
@@ -258,7 +258,8 @@ 
     def __init__(self, context, config):
         super(LavaMasterImageClient, self).__init__(context, config)
         cmd = self.device_option("connection_command")
-        proc = logging_spawn(cmd, timeout=1200, logfile=self.sio)
+        proc = logging_spawn(cmd, timeout=1200)
+        proc.logfile_read = self.sio
         #serial can be slow, races do funny things if you don't increase delay
         proc.delaybeforesend=1
         self.proc = proc

=== modified file 'lava_dispatcher/job.py'
--- lava_dispatcher/job.py	2012-03-13 03:47:38 +0000
+++ lava_dispatcher/job.py	2012-03-15 23:16:06 +0000
@@ -137,7 +137,7 @@ 
         try:
             for cmd in self.job_data['actions']:
                 params = cmd.get('parameters', {})
-                logging.info("[ACTION-B] Command %s is started with parameters %s." % (cmd['command'],params))
+                logging.info("[ACTION-B] %s is started with %s" % (cmd['command'], params))
                 metadata = cmd.get('metadata', {})
                 self.context.test_data.add_metadata(metadata)
                 action = lava_commands[cmd['command']](self.context)