Improve logging

[lgpl/argeo-commons.git] / org.argeo.cms.lib.sshd / src / org / argeo / cms / ssh / CmsSshServer.java

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 f5609a37d5f70e2786153c567f96e0d0759a5684..83e7392bca18baff4a50ee0329164fcd0c35ba41 100644 (file)
--- 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
@@ -3,6 +3,7 @@ package org.argeo.cms.ssh;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Writer;
+import java.net.InetSocketAddress;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -39,9 +40,9 @@ import org.apache.sshd.sftp.server.SftpSubsystemFactory;
 import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.CmsSshd;
 import org.argeo.api.cms.CmsState;
 import org.argeo.cms.CmsDeployProperty;
-import org.argeo.cms.CmsSshd;
 
 public class CmsSshServer implements CmsSshd {
        private final static CmsLog log = CmsLog.getLog(CmsSshServer.class);
@@ -171,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);
                }
@@ -205,7 +206,10 @@ public class CmsSshServer implements CmsSshd {
                                        (PrivateKey) store.getKey(CmsConstants.NODE, keyStorePassword));
                } catch (IOException | KeyStoreException | NoSuchProviderException | NoSuchAlgorithmException
                                | CertificateException | IllegalArgumentException | UnrecoverableKeyException e) {
-                       log.error("Cannot add node public key to SSH authorized keys", e);
+                       if (log.isTraceEnabled())
+                               log.warn("Cannot add node public key to SSH authorized keys", e);
+                       else
+                               log.warn("Cannot add node public key to SSH authorized keys: " + e);
                        return null;
                }
 
@@ -215,4 +219,9 @@ public class CmsSshServer implements CmsSshd {
                this.cmsState = cmsState;
        }
 
+       @Override
+       public InetSocketAddress getAddress() {
+               return new InetSocketAddress(host, port);
+       }
+
 }