Skip to content

Commit

Permalink
One step, disabling some complex code
Browse files Browse the repository at this point in the history
  • Loading branch information
@dizzzz
dizzzz committed Nov 25, 2024
1 parent 2b0c36d commit 59db7f3
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 76 deletions.
152 changes: 77 additions & 75 deletions exist-core/src/main/java/org/exist/jetty/JettyStart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@
import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.server.*;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.server.Handler.Wrapper;
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.eclipse.jetty.util.Jetty;
import org.eclipse.jetty.util.MultiException;
//import org.eclipse.jetty.util.MultiException;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.resource.PathResource;
import org.eclipse.jetty.util.resource.PathResourceFactory;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.xml.XmlConfiguration;
import org.exist.SystemProperties;
Expand Down Expand Up @@ -261,7 +262,8 @@ public synchronized void run(final String[] args, final Observer observer) {
XmlConfiguration last = null;
for(final Path confFile : configFiles) {
logger.info("[loading jetty configuration : {}]", confFile.toString());
final Resource resource = new PathResource(confFile);
PathResourceFactory prf = new PathResourceFactory();
final Resource resource = prf.newResource(confFile);
final XmlConfiguration configuration = new XmlConfiguration(resource);
if (last != null) {
configuration.getIdMap().putAll(last.getIdMap());
Expand Down Expand Up @@ -304,17 +306,17 @@ public synchronized void run(final String[] args, final Observer observer) {
}
}

//*************************************************************
final List<URI> serverUris = getSeverURIs(server);
if(!serverUris.isEmpty()) {
this.primaryPort = serverUris.get(0).getPort();

}
logger.info("-----------------------------------------------------");
logger.info("Server has started, listening on:");
for(final URI serverUri : serverUris) {
logger.info("{}", serverUri.resolve("/"));
}
// //*************************************************************
// final List<URI> serverUris = getSeverURIs(server);
// if(!serverUris.isEmpty()) {
// this.primaryPort = serverUris.get(0).getPort();
//
// }
// logger.info("-----------------------------------------------------");
// logger.info("Server has started, listening on:");
// for(final URI serverUri : serverUris) {
// logger.info("{}", serverUri.resolve("/"));
// }

logger.info("Configured contexts:");
final LinkedHashSet<Handler> handlers = getAllHandlers(server.getHandler());
Expand Down Expand Up @@ -351,20 +353,20 @@ public synchronized void run(final String[] args, final Observer observer) {
setChanged();
notifyObservers(SIGNAL_STARTED);

} catch (final MultiException e) {
} catch (final RuntimeException e) {

// Mute the BindExceptions

boolean hasBindException = false;
for (final Throwable t : e.getThrowables()) {
if (t instanceof java.net.BindException) {
hasBindException = true;
logger.error("----------------------------------------------------------");
logger.error("ERROR: Could not bind to port because {}", t.getMessage());
logger.error(t.toString());
logger.error("----------------------------------------------------------");
}
}
// for (final Throwable t : e.getThrowables()) {
// if (t instanceof java.net.BindException) {
// hasBindException = true;
// logger.error("----------------------------------------------------------");
// logger.error("ERROR: Could not bind to port because {}", t.getMessage());
// logger.error(t.toString());
// logger.error("----------------------------------------------------------");
// }
// }

// If it is another error, print stacktrace
if (!hasBindException) {
Expand All @@ -389,7 +391,7 @@ public synchronized void run(final String[] args, final Observer observer) {
}

private LinkedHashSet<Handler> getAllHandlers(final Handler handler) {
if(handler instanceof HandlerWrapper handlerWrapper) {
if(handler instanceof Handler.Wrapper handlerWrapper) {
final LinkedHashSet<Handler> handlers = new LinkedHashSet<>();
handlers.add(handlerWrapper);
if(handlerWrapper.getHandler() != null) {
Expand All @@ -400,7 +402,7 @@ private LinkedHashSet<Handler> getAllHandlers(final Handler handler) {
} else if(handler instanceof HandlerContainer handlerContainer) {
final LinkedHashSet<Handler> handlers = new LinkedHashSet<>();
handlers.add(handler);
for(final Handler childHandler : handlerContainer.getChildHandlers()) {
for(final Handler childHandler : handlerContainer.getHandlers()) {
handlers.addAll(getAllHandlers(childHandler));
}
return handlers;
Expand All @@ -413,53 +415,53 @@ private LinkedHashSet<Handler> getAllHandlers(final Handler handler) {
}
}

/**
* See {@link Server#getURI()}
*/
private List<URI> getSeverURIs(final Server server) {
final ContextHandler context = server.getChildHandlerByClass(ContextHandler.class);
return Arrays.stream(server.getConnectors())
.filter(connector -> connector instanceof NetworkConnector)
.map(connector -> (NetworkConnector)connector)
.map(networkConnector -> getURI(networkConnector, context))
.filter(Objects::nonNull)
.collect(Collectors.toList());
}

/**
* See {@link Server#getURI()}
*/
private URI getURI(final NetworkConnector networkConnector, final ContextHandler context) {
try {
final String protocol = networkConnector.getDefaultConnectionFactory().getProtocol();
final String scheme;
if (protocol.startsWith("SSL-") || protocol.equals("SSL")) {
scheme = "https";
} else {
scheme = "http";
}

String host = null;
if (context != null && context.getVirtualHosts() != null && context.getVirtualHosts().length > 0) {
host = context.getVirtualHosts()[0];
} else {
host = networkConnector.getHost();
}

if (host == null) {
host = InetAddress.getLocalHost().getHostAddress();
}

String path = context == null ? null : context.getContextPath();
if (path == null) {
path = "/";
}
return new URI(scheme, null, host, networkConnector.getLocalPort(), path, null, null);
} catch(final UnknownHostException | URISyntaxException e) {
logger.warn(e);
return null;
}
}
// /**
// * See {@link Server#getURI()}
// */
// private List<URI> getSeverURIs(final Server server) {
// final ContextHandler context = server.getChildHandlerByClass(ContextHandler.class);
// return Arrays.stream(server.getConnectors())
// .filter(connector -> connector instanceof NetworkConnector)
// .map(connector -> (NetworkConnector)connector)
// .map(networkConnector -> getURI(networkConnector, context))
// .filter(Objects::nonNull)
// .collect(Collectors.toList());
// }

// /**
// * See {@link Server#getURI()}
// */
// private URI getURI(final NetworkConnector networkConnector, final ContextHandler context) {
// try {
// final String protocol = networkConnector.getDefaultConnectionFactory().getProtocol();
// final String scheme;
// if (protocol.startsWith("SSL-") || protocol.equals("SSL")) {
// scheme = "https";
// } else {
// scheme = "http";
// }
//
// String host = null;
// if (context != null && context.getVirtualHosts() != null && context.getVirtualHosts().length > 0) {
// host = context.getVirtualHosts()[0];
// } else {
// host = networkConnector.getHost();
// }
//
// if (host == null) {
// host = InetAddress.getLocalHost().getHostAddress();
// }
//
// String path = context == null ? null : context.getContextPath();
// if (path == null) {
// path = "/";
// }
// return new URI(scheme, null, host, networkConnector.getLocalPort(), path, null, null);
// } catch(final UnknownHostException | URISyntaxException e) {
// logger.warn(e);
// return null;
// }
// }

private Optional<Server> startJetty(final List<Object> configuredObjects) throws Exception {
// For all objects created by XmlConfigurations, start them if they are lifecycles.
Expand Down
2 changes: 1 addition & 1 deletion exist-core/src/test/java/org/exist/xquery/functions/xmldb/DbStoreTest2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.Handler.List;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.exist.test.ExistXmldbEmbeddedServer;
import org.exist.xmldb.concurrent.DBUtils;
Expand Down

0 comments on commit 59db7f3

Please sign in to comment.