When serious warnings show up in the console/warning logging during
a test, a WARN message is now inserted into the status logs.
From: John Admanski <jadmanski@google.com>
Signed-off-by: Martin Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@897 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/ssh_host.py b/server/hosts/ssh_host.py
index e5c3dbc..1ec33f7 100644
--- a/server/hosts/ssh_host.py
+++ b/server/hosts/ssh_host.py
@@ -49,7 +49,7 @@
SSH_BASE_COMMAND = 'ssh -a'
def __init__(self, hostname, user="root", port=22, initialize=True,
- conmux_log="console.log", conmux_warnings="warning.log",
+ conmux_log="console.log", conmux_warnings="status.log",
conmux_server=None, conmux_attach=None,
netconsole_log=None, netconsole_port=6666):
"""
@@ -238,13 +238,14 @@
if logfilename == None:
return
script_path = os.path.join(self.serverdir, 'warning_monitor')
- script_cmd = 'expect %s %s' % (script_path, self.hostname)
+ script_cmd = 'expect %s %s >> %s' % (script_path,
+ self.hostname,
+ logfilename)
if self.conmux_server:
to = '%s/%s'
cmd = [self.conmux_attach, self.__conmux_hostname(), script_cmd]
logger = subprocess.Popen(cmd,
- stdout=open(logfilename, 'a', 0),
- stderr=subprocess.STDOUT,
+ stderr=open('debug/conmux.log', 'a', 0),
preexec_fn=lambda: os.setpgid(0, 0))
self.warning_pid = logger.pid