rtyler/azure-vm-agents-plugin
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge pull request #55 from mmitche/channel-stream-order

Browse Source 
Get channels before connection
This commit is contained in:
Arjun Roy Chaudhuri 2016-09-28 15:46:15 -07:00 committed by GitHub
commit 10a5b12b42
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/microsoftopentechnologies/azure/remote/AzureSSHLauncher.java
View File

@ -241,9 +241,13 @@ public class AzureSSHLauncher extends ComputerLauncher {
ChannelExec channel = null;
LOGGER.info("AzureSSHLauncher: executeRemoteCommand: starts");
try {
channel = createExecChannel(jschSession, command);
channel = (ChannelExec) jschSession.openChannel("exec");
channel.setCommand(command);
channel.setInputStream(null);
channel.setErrStream(System.err);
final InputStream inputStream = channel.getInputStream();
final InputStream errorStream = channel.getErrStream();
channel.connect(60 * 1000);
// Read from input stream
try {
@ -289,15 +293,6 @@ public class AzureSSHLauncher extends ComputerLauncher {
return -1;
}
private ChannelExec createExecChannel(final Session jschSession, final String command) throws JSchException {
final ChannelExec echannel = (ChannelExec) jschSession.openChannel("exec");
echannel.setCommand(command);
echannel.setInputStream(null);
echannel.setErrStream(System.err);
echannel.connect(60 * 1000);
return echannel;
}
private Session connectToSsh(final AzureSlave slave) throws Exception {
LOGGER.info("AzureSSHLauncher: connectToSsh: start");
Session session = null;