Skip to content
Snippets Groups Projects
Commit 92ddc557 authored by Chris Hines's avatar Chris Hines
Browse files

try this

parent 0fef6238
No related branches found
No related tags found
3 merge requests!77Revert "disable agressive kill and restart",!45Test,!44Dev
Pipeline #11984 passed
...@@ -202,6 +202,7 @@ class Ssh: ...@@ -202,6 +202,7 @@ class Ssh:
raise SshCtrlException(stderr.decode()) raise SshCtrlException(stderr.decode())
sess.lock.release() sess.lock.release()
logger.error('leaving get_ctrl_master_socket {}',sess.ctrl_processes[ctrlsocket].returncode)
return ctrlsocket return ctrlsocket
@staticmethod @staticmethod
......
...@@ -146,7 +146,6 @@ class SSHSession: ...@@ -146,7 +146,6 @@ class SSHSession:
import signal import signal
import logging import logging
import time import time
self.lock.acquire()
logger=logging.getLogger() logger=logging.getLogger()
logger.debug("shuting down ssh session for {} last seen at {}".format(self.authtok,self.last)) logger.debug("shuting down ssh session for {} last seen at {}".format(self.authtok,self.last))
for pid in self.pids: for pid in self.pids:
...@@ -180,7 +179,6 @@ class SSHSession: ...@@ -180,7 +179,6 @@ class SSHSession:
for tunnel in self.tunnels: for tunnel in self.tunnels:
tunnel.kill() tunnel.kill()
(stdout, stderr) = tunnel.communicate() (stdout, stderr) = tunnel.communicate()
self.lock.acquire()
@staticmethod @staticmethod
def test_sshsession(sess): def test_sshsession(sess):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment