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

more logz

parent 3402b6a0
No related branches found
No related tags found
3 merge requests!77Revert "disable agressive kill and restart",!45Test,!44Dev
Pipeline #11981 passed
...@@ -353,7 +353,7 @@ class Ssh: ...@@ -353,7 +353,7 @@ class Ssh:
ctrlsocket = Ssh.get_ctrl_master_socket(sess, host, user, sshport) ctrlsocket = Ssh.get_ctrl_master_socket(sess, host, user, sshport)
else: else:
ctrlsocket = Ssh.get_ctrl_master_socket(sess, bastion, user, bastionsshport) ctrlsocket = Ssh.get_ctrl_master_socket(sess, bastion, user, bastionsshport)
logger.debug('in execute, got my ctrlsocket {}'.format(sess.control_processes[ctrlsocket].pid)) logger.debug('in execute, got my ctrlsocket {}'.format(sess.ctrl_processes[ctrlsocket].pid))
if bastion == None: if bastion == None:
# we are executing this command on the login node, so no more magic is needed # we are executing this command on the login node, so no more magic is needed
sshcmd = Ssh.SSHCMDWITHOPTS.copy() sshcmd = Ssh.SSHCMDWITHOPTS.copy()
...@@ -443,7 +443,7 @@ class Ssh: ...@@ -443,7 +443,7 @@ class Ssh:
Ssh.validate_username(user) Ssh.validate_username(user)
Ssh.validate_hostname(host) Ssh.validate_hostname(host)
ctrlsocket = Ssh.get_ctrl_master_socket(sess, host, user, sshport) ctrlsocket = Ssh.get_ctrl_master_socket(sess, host, user, sshport)
logger.debug('in tunnel, got my ctrlsocket {}'.format(sess.control_processes[ctrlsocket].pid)) logger.debug('in tunnel, got my ctrlsocket {}'.format(sess.ctrl_processes[ctrlsocket].pid))
localport = Ssh.get_free_port() localport = Ssh.get_free_port()
if port == 22 or (not internalfirewall and not localbind): if port == 22 or (not internalfirewall and not localbind):
......
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