From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 5 Mar 2024 15:16:26 +0000 (+0100)
Subject: Improve logging
X-Git-Tag: v2.3.28~32
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=7a6b6170a008b82ad0c4feebca5cd9273a573a2a

Improve logging
---

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() {
diff --git a/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/CmsSshServer.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/CmsSshServer.java
index 2480c3df4..83e7392bc 100644
--- a/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/CmsSshServer.java
+++ b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/CmsSshServer.java
@@ -172,7 +172,7 @@ public class CmsSshServer implements CmsSshd {
 			// start
 			sshd.start();
 
-			log.debug(() -> "CMS SSH server started on port " + port + (host != null ? " of host " + host : ""));
+			log.info("# SSH " + (host != null ? host + ":" : "*:") + port);
 		} catch (IOException e) {
 			throw new RuntimeException("Cannot start SSH server on port " + port, e);
 		}