From 0158283f67cde77032ac3a98079fa3e57a111053 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Thu, 13 Oct 2016 08:27:21 +0200
Subject: [PATCH] ssh client bug fix
---
wetb/utils/cluster_tools/ssh_client.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/wetb/utils/cluster_tools/ssh_client.py b/wetb/utils/cluster_tools/ssh_client.py
index 4a69aac1..786437cf 100644
--- a/wetb/utils/cluster_tools/ssh_client.py
+++ b/wetb/utils/cluster_tools/ssh_client.py
@@ -37,7 +37,13 @@ class SSHClient(object):
self.disconnect += 1
if self.client is None or self.client._transport is None or self.client._transport.is_active() is False:
self.close()
- self.connect()
+ try:
+ self.connect()
+ self.disconnect = 1
+ except Exception as e:
+ self.close()
+ self.disconnect = 0
+ raise e
return self.client
def connect(self):
@@ -99,7 +105,6 @@ class SSHClient(object):
return out.strip() == "File exists"
def execute(self, command, sudo=False, verbose=False):
-
feed_password = False
if sudo and self.username != "root":
command = "sudo -S -p '' %s" % command
@@ -113,7 +118,7 @@ class SSHClient(object):
if ssh is None:
exc_info = sys.exc_info()
traceback.print_exception(*exc_info)
- raise Exception("ssh_client exe ssh is NOne")
+ raise Exception("ssh_client exe ssh is None")
stdin, stdout, stderr = ssh.exec_command(command)
if feed_password:
stdin.write(self.password + "\n")
--
GitLab