projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve logging
[lgpl/argeo-commons.git]
/
org.argeo.cms.lib.jetty
/
src
/
org
/
argeo
/
cms
/
jetty
/
JettyHttpServer.java
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 74f0aaed3d8ddeb3154585386f15a5968d8c54eb..9d35dadb5d49eabe9464c433f88a8111387eff3e 100644
(file)
--- 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
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
} 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() {
}
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() {
}
public Integer getHttpPort() {