Server side messages cleanup. In this patch, the aim was:
* Fix issues with spacing on some messages
* Make server output coherent with client output
* Remove verbosity turned obsolete by the logging system
(it's not necessary to manually prepend debug messages with the method they
belong to)
Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3398 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/abstract_ssh.py b/server/hosts/abstract_ssh.py
index 9548264..a3b26c7 100644
--- a/server/hosts/abstract_ssh.py
+++ b/server/hosts/abstract_ssh.py
@@ -265,8 +265,8 @@
delete_dest, preserve_symlinks)
utils.run(rsync)
except error.CmdError, e:
- logging.warn("warning: rsync failed with: %s", e)
- logging.info("attempting to copy with scp instead")
+ logging.warn("Command rsync failed with: %s", e)
+ logging.info("Attempting to copy with scp instead")
# scp has no equivalent to --delete, just drop the entire dest dir
if delete_dest:
@@ -294,9 +294,9 @@
def ssh_ping(self, timeout=60):
try:
self.run("true", timeout=timeout, connect_timeout=timeout)
- logging.info("ssh_ping of %s completed sucessfully", self.hostname)
+ logging.info("Host (ssh) %s is alive", self.hostname)
except error.AutoservSSHTimeout:
- msg = "ssh ping timed out (timeout = %d)" % timeout
+ msg = "Host (ssh) verify timed out (timeout = %d)" % timeout
raise error.AutoservSSHTimeout(msg)
except error.AutoservSshPermissionDeniedError:
#let AutoservSshPermissionDeniedError be visible to the callers
