mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-05 07:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/utils: sshcontrol: realtime logging of output

Browse Source 
Log the output of the command as it runs not when it finished, else
tail -f tmp/work/minnow-poky-linux/core-image-sato/1.0-r0/testimage/ssh_target_log
isn't as useful as it could be.

(From OE-Core rev: be8f766f43d85c364b9706b464ed0a59d0fbf0b7)

Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Stefan Stanacar
2014-04-25 14:35:27 +03:00
committed by Richard Purdie
parent bdb07c66c8
commit 2b822a8458
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
meta/lib/oeqa/utils/sshcontrol.py
View File

@@ -29,8 +29,15 @@ class SSHProcess(object):
self.output = None
self.process = None
self.starttime = None
self.logfile = None
def run(self, command, timeout=None):
def log(self, msg):
if self.logfile:
with open(self.logfile, "a") as f:
f.write("%s" % msg)
def run(self, command, timeout=None, logfile=None):
self.logfile = logfile
self.starttime = time.time()
output = ''
self.process = subprocess.Popen(command, **self.options)
@@ -45,8 +52,10 @@ class SSHProcess(object):
eof = True
else:
output += data
self.log(data)
endtime = time.time() + timeout
# process hasn't returned yet
if not eof:
self.process.terminate()
@@ -55,9 +64,12 @@ class SSHProcess(object):
self.process.kill()
except OSError:
pass
output += "\nProcess killed - no output for %d seconds. Total running time: %d seconds." % (timeout, time.time() - self.starttime)
lastline = "\nProcess killed - no output for %d seconds. Total running time: %d seconds." % (timeout, time.time() - self.starttime)
self.log(lastline)
output += lastline
else:
output = self.process.communicate()[0]
self.log(output.rstrip())
self.status = self.process.wait()
self.output = output.rstrip()
@@ -91,9 +103,8 @@ class SSHControl(object):
self.log("[Running]$ %s" % " ".join(command))
proc = SSHProcess()
status, output = proc.run(command, timeout)
status, output = proc.run(command, timeout, logfile=self.logfile)
self.log("%s" % output)
self.log("[Command returned '%d' after %.2f seconds]" % (status, time.time() - proc.starttime))
if status and not ignore_status: