aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2018-07-25 12:08:24 +0200
committerSander Vrijders <sander.vrijders@ugent.be>2018-07-25 12:08:24 +0200
commite2578368efb337404450000a3e955b872d6b1695 (patch)
tree6fccdbac1da8fe864d0b796880b603f79fa161e7
parent945af57802caa299ae1568e30cdaa655c527e5fe (diff)
parent540662296627b050150ab81ada77906dce209f89 (diff)
downloadrumba-e2578368efb337404450000a3e955b872d6b1695.tar.gz
rumba-e2578368efb337404450000a3e955b872d6b1695.zip
Merge branch 'master' into testing
-rw-r--r--rumba/ssh_support.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py
index 5d62b81..7b3a163 100644
--- a/rumba/ssh_support.py
+++ b/rumba/ssh_support.py
@@ -95,6 +95,7 @@ def ssh_connect(hostname, port, username, password, time_out, proxy_server):
look_for_keys=True, timeout=time_out)
trans = proxy_client.get_transport()
+ trans.set_keepalive(30)
proxy = trans.open_channel('direct-tcpip',
(hostname, port), ('127.0.0.1', 0))
else:
@@ -134,6 +135,7 @@ def ssh_chan(ssh_config, testbed, time_out):
max_retries = 2
while retry < max_retries:
try:
+ ssh_config.client.get_transport().set_keepalive(30)
chan = ssh_config.client.get_transport().open_session()
return chan
except paramiko.ssh_exception.SSHException as e: