antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Be smarter about opening listeners in JettyServer

Browse source
This commit is contained in:
hns 2008-12-13 02:53:10 +00:00
parent c820cab550
commit a72c19adc5
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/helma/main/JettyServer.java
View file

@ -19,12 +19,12 @@ package helma.main;
import org.mortbay.http.HttpServer; import org.mortbay.http.HttpServer;
import org.mortbay.http.HttpContext; import org.mortbay.http.HttpContext;
import org.mortbay.http.SocketListener; import org.mortbay.http.SocketListener;
import org.mortbay.http.HttpListener;
import org.mortbay.http.ajp.AJP13Listener; import org.mortbay.http.ajp.AJP13Listener;
import org.mortbay.util.InetAddrPort; import org.mortbay.util.InetAddrPort;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.net.URL; import java.net.URL;
import java.net.MalformedURLException;
import java.io.IOException; import java.io.IOException;
public class JettyServer { public class JettyServer {
@ -46,6 +46,7 @@ public class JettyServer {
private JettyServer(URL url) throws IOException { private JettyServer(URL url) throws IOException {
http = new org.mortbay.jetty.Server(url); http = new org.mortbay.jetty.Server(url);
openListeners();
} }
private JettyServer(InetEndpoint webPort, InetEndpoint ajpPort, Server server) private JettyServer(InetEndpoint webPort, InetEndpoint ajpPort, Server server)
@ -54,13 +55,7 @@ public class JettyServer {
// create embedded web server if port is specified // create embedded web server if port is specified
if (webPort != null) { if (webPort != null) {
// opening the listener here allows us to run on priviledged port 80 under jsvc http.addListener(new InetAddrPort(webPort.getInetAddress(), webPort.getPort()));
// even as non-root user, because init() is called with root privileges
// while start() will be called with the user we will actually run as
InetAddrPort addr = new InetAddrPort(webPort.getInetAddress(), webPort.getPort());
SocketListener listener = new SocketListener(addr);
listener.open();
http.addListener(listener);
} }
// activate the ajp13-listener // activate the ajp13-listener
@ -88,6 +83,7 @@ public class JettyServer {
ajp13.setRemoteServers(jkallowarr); ajp13.setRemoteServers(jkallowarr);
server.getLogger().info("Starting AJP13-Listener on port " + (ajpPort)); server.getLogger().info("Starting AJP13-Listener on port " + (ajpPort));
} }
openListeners();
} }
public HttpServer getHttpServer() { public HttpServer getHttpServer() {
@ -119,4 +115,17 @@ public class JettyServer {
public void destroy() { public void destroy() {
http.destroy(); http.destroy();
} }
private void openListeners() throws IOException {
// opening the listener here allows us to run on priviledged port 80 under jsvc
// even as non-root user, because init() is called with root privileges
// while start() will be called with the user we will actually run as
HttpListener[] listeners = http.getListeners();
for (int i = 0; i < listeners.length; i++) {
if (listeners[i] instanceof SocketListener) {
SocketListener listener = (SocketListener) listeners[i];
listener.open();
}
}
}
} }