marvin: remoteSSHClient logger handler

Prasanna Santhanam · Prasanna Santhanam · commit ceea53cd8ffb · 2012-12-13T19:22:49.000-08:00
send the logs to the console stream
diff --git a/tools/marvin/marvin/remoteSSHClient.py b/tools/marvin/marvin/remoteSSHClient.py
@@ -30,12 +30,16 @@ def __init__(self, host, port, user, passwd, retries = 10):
         self.passwd = passwd
         self.ssh = paramiko.SSHClient()
         self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+        self.logger = logging.getLogger('sshClient')
+        ch = logging.StreamHandler()
+        ch.setLevel(logging.DEBUG)
+        self.logger.addHandler(ch)
 
         retry_count = retries
         while True:
             try:
                 self.ssh.connect(str(host),int(port), user, passwd)
-                logging.debug("[SSHClient] connecting to server %s @ port % with user:passwd %s:%s"%(str(host), port, user, passwd))
+                self.logger.debug("connecting to server %s with user %s passwd %s"%(str(host), user, passwd))
             except paramiko.SSHException, sshex:
                 if retry_count == 0:
                     raise cloudstackException.InvalidParameterException(repr(sshex))
@@ -48,7 +52,7 @@ def __init__(self, host, port, user, passwd, retries = 10):
         
     def execute(self, command):
         stdin, stdout, stderr = self.ssh.exec_command(command)
-        logging.debug("[SSHClient] sending command %s to host"%(command, str(self.host)))
+        self.logger.debug("sending command %s to host %s"%(command, str(self.host)))
         output = stdout.readlines()
         errors = stderr.readlines()
         results = []
@@ -60,7 +64,7 @@ def execute(self, command):
         else:
             for strOut in output:
                 results.append(strOut.rstrip())
-        logging.debug("[SSHClient] command %s returned %s"%(command, results))
+        self.logger.debug("command %s returned %s"%(command, results))
         return results
     
     def scp(self, srcFile, destPath):
