X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.lib.jetty%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjetty%2FJettyHttpServer.java;h=9d35dadb5d49eabe9464c433f88a8111387eff3e;hb=7a6b6170a008b82ad0c4feebca5cd9273a573a2a;hp=74f0aaed3d8ddeb3154585386f15a5968d8c54eb;hpb=149eda5cb22100f249dc7a8caeaf2a0c42bbd6b8;p=lgpl%2Fargeo-commons.git 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..9d35dadb5 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 @@ -279,7 +279,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 +315,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() {