From 1281b54fbc32f3edc04e6a9bcc80887b8999a4e5 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Wed, 16 Sep 2020 11:56:13 +1000
Subject: [PATCH] log ctrlmaster error messages
---
tes/sshwrapper/__init__.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tes/sshwrapper/__init__.py b/tes/sshwrapper/__init__.py
index 77301ff..2ea2793 100644
--- a/tes/sshwrapper/__init__.py
+++ b/tes/sshwrapper/__init__.py
@@ -116,6 +116,9 @@ class Ssh:
# I an existing control process is recoreded, but we are starting a new one, try to delete the old one
if ctrlsocket in sess.ctrl_processes:
try:
+ (stderr,stdout) = sess.ctrl_processes[ctrlsocket].communicate()
+ logger.error("control master terminated with stderr {}".format(stderr))
+ logger.error("control master terminated with stdout {}".format(stdout))
os.killpg(int(sess.ctrl_processes[ctrlsocket].pid),signal.SIGKILL)
except:
pass
@@ -123,7 +126,7 @@ class Ssh:
sshcmd = Ssh.SSHCMDWITHOPTS.copy()
sshcmd.extend([
"-S", ctrlsocket,
- "-M", '-o', 'ControlPersist=10s',
+ "-M", '-o', 'ControlPersist=60s',
'-p', sshport, '-N','-l', user, host])
env = os.environ.copy()
if sess.socket is None:
--
GitLab