changes to the TCP port is now reflected dynamically to the listener.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3099 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2007-04-14 17:16:10 +00:00
1 parent 1dcac9ab93
commit 9b5984dfb4
2 files changed
+17 -1

No files matched your search

@@ -50,12 +50,15 @@ public class TcpSlaveAgentListener extends Thread {
private volatile boolean shuttingDown;
private final String secretKey;
public final int configuredPort;
/**
* @param port
* Use 0 to choose a random port.
*/
public TcpSlaveAgentListener(int port) throws IOException {
serverSocket = new ServerSocket(port);
this.configuredPort = port;
LOGGER.info("JNLP slave agent listener started on TCP port "+getPort());
+14 -1
View File
@@ -159,7 +159,7 @@ public final class Hudson extends View implements ItemGroup<TopLevelItem>, Node
*/
public transient final PluginManager pluginManager;
public transient final TcpSlaveAgentListener tcpSlaveAgentListener;
public transient volatile TcpSlaveAgentListener tcpSlaveAgentListener;
/**
* List of registered {@link JobListener}s.
@@ -922,6 +922,19 @@ public final class Hudson extends View implements ItemGroup<TopLevelItem>, Node
throw new FormException("Bad port number "+req.getParameter("slaveAgentPort"),"slaveAgentPort");
}
}
// relaunch the agent
if(tcpSlaveAgentListener==null) {
if(slaveAgentPort!=-1)
tcpSlaveAgentListener = new TcpSlaveAgentListener(slaveAgentPort);
} else {
if(tcpSlaveAgentListener.configuredPort!=slaveAgentPort) {
tcpSlaveAgentListener.shutdown();
tcpSlaveAgentListener = null;
if(slaveAgentPort!=-1)
tcpSlaveAgentListener = new TcpSlaveAgentListener(slaveAgentPort);
}
}
}
numExecutors = Integer.parseInt(req.getParameter("numExecutors"));