From eb3eb0ffdea52b1d4394046e29214271e5ec0535 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Wed, 16 Sep 2020 16:23:25 +1000
Subject: [PATCH] bind on ipv4 not 6
---
tes/sshwrapper/__init__.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tes/sshwrapper/__init__.py b/tes/sshwrapper/__init__.py
index f3f54b7..8de07b7 100644
--- a/tes/sshwrapper/__init__.py
+++ b/tes/sshwrapper/__init__.py
@@ -452,9 +452,13 @@ class Ssh:
sess.pids.append(tunnel_p.pid)
logger.debug('tunnel created with pid {}'.format(tunnel_p.pid))
try:
- tunnel_p.wait(timeout=3)
- (stdout,stderr) = tunnel_p.communicate()
- logger.error('tunnel process exited {} {}'.format(stdout,stderr))
+ #tunnel_p.wait(timeout=3)
+ import time
+ time.sleep(3)
+ tunnel_p.poll()
+ if tunnel_p.returncode != None
+ (stdout,stderr) = tunnel_p.communicate()
+ logger.error('tunnel process exited {} {} {}'.format(tunnel_p.returncode, stdout, stderr))
except subprocess.TimeoutExpired:
pass
return localport, [tunnel_p.pid]
--
GitLab