OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-06 16:45:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved the error diagnostics on the failure to establish connection with JNLP slaves early on.

Browse Source 
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23883 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2009-11-20 02:52:49 +00:00
1 parent 63e48ae865
commit 2e3365a070
1 file changed
+25 -18
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/hudson/TcpSlaveAgentListener.java
+25 -18
View File
@@ -227,26 +227,33 @@ public final class TcpSlaveAgentListener extends Thread {
out.println(Engine.GREETING_SUCCESS);
final OutputStream log = computer.openLogFile();
new PrintWriter(log).println("JNLP agent connected from "+ this.s.getInetAddress());
PrintWriter logw = new PrintWriter(log,true);
logw.println("JNLP agent connected from "+ this.s.getInetAddress());
computer.setChannel(new BufferedInputStream(this.s.getInputStream()), new BufferedOutputStream(this.s.getOutputStream()), log,
new Listener() {
@Override
public void onClosed(Channel channel, IOException cause) {
try {
log.close();
} catch (IOException e) {
e.printStackTrace();
try {
computer.setChannel(new BufferedInputStream(this.s.getInputStream()), new BufferedOutputStream(this.s.getOutputStream()), log,
new Listener() {
@Override
public void onClosed(Channel channel, IOException cause) {
try {
log.close();
} catch (IOException e) {
e.printStackTrace();
}
if(cause!=null)
LOGGER.log(Level.WARNING, "Connection #"+id+" terminated",cause);
try {
ConnectionHandler.this.s.close();
} catch (IOException e) {
// ignore
}
}
if(cause!=null)
LOGGER.log(Level.WARNING, "Connection #"+id+" terminated",cause);
try {
ConnectionHandler.this.s.close();
} catch (IOException e) {
// ignore
}
}
});
});
} catch (IOException e) {
logw.println("Failed to establish the connection with the slave");
e.printStackTrace(logw);
throw e;
}
}
private void error(PrintWriter out, String msg) throws IOException {