X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.cms.lib.jetty%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjetty%2FJettyHttpServer.java;fp=org.argeo.cms.lib.jetty%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjetty%2FJettyHttpServer.java;h=4e91ea41c734a51f739a1d82d2d030000788fb38;hp=74f0aaed3d8ddeb3154585386f15a5968d8c54eb;hb=b95462873703848193e56fcbe997693630db6121;hpb=55d88fba80cec198a0f11ba7545e19878c51fc5e diff --git a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java index 74f0aaed3..4e91ea41c 100644 --- a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java +++ b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java @@ -230,6 +230,7 @@ public class JettyHttpServer extends HttpsServer { server.stop(); // TODO delete temp dir started = false; + log.debug(() -> "Stopped Jetty server"); } catch (Exception e) { log.error("Cannot stop Jetty HTTP server", e); } @@ -279,7 +280,7 @@ public class JettyHttpServer extends HttpsServer { if (httpContext instanceof ContextHandlerHttpContext contextHandlerHttpContext) { // TODO stop handler first? // FIXME understand compatibility with Jetty 12 - //contextHandlerCollection.removeHandler(contextHandlerHttpContext.getServletContextHandler()); + // contextHandlerCollection.removeHandler(contextHandlerHttpContext.getServletContextHandler()); } else { // FIXME apparently servlets cannot be removed in Jetty, we should replace the // handler @@ -315,9 +316,16 @@ public class JettyHttpServer extends HttpsServer { } private String httpPortsMsg() { + String hostStr = getHost(); + hostStr = hostStr == null ? "*:" : hostStr + ":"; + return (httpConnector != null ? "# HTTP " + hostStr + getHttpPort() + " " : "") + + (httpsConnector != null ? "# HTTPS " + hostStr + getHttpsPort() : ""); + } - return (httpConnector != null ? "HTTP " + getHttpPort() + " " : "") - + (httpsConnector != null ? "HTTPS " + getHttpsPort() : ""); + public String getHost() { + if (httpConnector == null) + return null; + return httpConnector.getHost(); } public Integer getHttpPort() {