From 92ddc557cf595f25f2cc0e2462c2a8763c72d361 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Fri, 18 Sep 2020 13:33:07 +1000
Subject: [PATCH] try this
---
tes/sshwrapper/__init__.py | 1 +
tes/tunnelstat/__init__.py | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/tes/sshwrapper/__init__.py b/tes/sshwrapper/__init__.py
index 4a21a2a..c933a70 100644
--- a/tes/sshwrapper/__init__.py
+++ b/tes/sshwrapper/__init__.py
@@ -202,6 +202,7 @@ class Ssh:
raise SshCtrlException(stderr.decode())
sess.lock.release()
+ logger.error('leaving get_ctrl_master_socket {}',sess.ctrl_processes[ctrlsocket].returncode)
return ctrlsocket
@staticmethod
diff --git a/tes/tunnelstat/__init__.py b/tes/tunnelstat/__init__.py
index 3059204..23422fb 100644
--- a/tes/tunnelstat/__init__.py
+++ b/tes/tunnelstat/__init__.py
@@ -146,7 +146,6 @@ class SSHSession:
import signal
import logging
import time
- self.lock.acquire()
logger=logging.getLogger()
logger.debug("shuting down ssh session for {} last seen at {}".format(self.authtok,self.last))
for pid in self.pids:
@@ -180,7 +179,6 @@ class SSHSession:
for tunnel in self.tunnels:
tunnel.kill()
(stdout, stderr) = tunnel.communicate()
- self.lock.acquire()
@staticmethod
def test_sshsession(sess):
--
GitLab