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

more fixy

parent abb583dd
No related branches found
No related tags found
3 merge requests!77Revert "disable agressive kill and restart",!45Test,!44Dev
Pipeline #11955 passed
......@@ -179,12 +179,12 @@ class Ssh:
ctrl_p.kill()
(stdout,stderr) = ctrl_p.communicate()
logger.error('control socket error {} {}'.format(stdout,stderr))
raise SshCtrlException(error.decode())
raise SshCtrlException(stderr.decode())
if not stat.S_ISSOCK(mode):
ctrl_p.kill()
(stdout,stderr) = ctrl_p.communicate()
logger.error('control socket error {} {}'.format(stdout,stderr))
raise SshCtrlException(error.decode())
raise SshCtrlException(stderr.decode())
sess.lock.release()
return ctrlsocket
......
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