Improve SSH{Client,Server} logging

Improve consistency with surrounding messages mentioning subsystem.

JIRA: NETCONET-1108
Change-Id: I279962885d17a413f4625602a86a8d3d2840d932
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHClient.java b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHClient.java
index 604c0ceb56316fb9a4a6dcad34f3ea7a02f04177..80dff4aa95e2bfded8ff53d4f6d531f8beee53f6 100644 (file)
--- a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHClient.java
+++ b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHClient.java
@@ -98,9 +98,10 @@ public final class SSHClient extends SSHTransportStack {
 
     private void onSubsystemOpenComplete(final OpenFuture future, final Long sessionId) {
         if (future.isOpened()) {
+            LOG.debug("Opened \"{}\" subsystem on session {}", subsystem, sessionId);
             transportEstablished(sessionId);
         } else {
-            LOG.error("Failed to establish transport on session {}", sessionId, future.getException());
+            LOG.error("Failed to open \"{}\" subsystem on session {}", subsystem, sessionId, future.getException());
             deleteSession(sessionId);
         }
     }

diff --git a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHServer.java b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHServer.java
index 49e62dc3caf6cff21a389e40fefb896454b0e08d..5852a594bc207507ecb74714908691e4cad43bec 100644 (file)
--- a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHServer.java
+++ b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHServer.java
@@ -79,6 +79,7 @@ public final class SSHServer extends SSHTransportStack {
         Futures.addCallback(cast(session).attachUnderlay(subsystem, getUnderlayOf(sessionId)), new FutureCallback<>() {
             @Override
             public void onSuccess(final Empty result) {
+                LOG.debug("Established \"{}\" subsystem on session {}", subsystem, sessionId);
                 // Note: we re-validating the underlay ... we may need to refactor state management to make this
                 //       non-awkward
                 transportEstablished(sessionId);
@@ -86,7 +87,7 @@ public final class SSHServer extends SSHTransportStack {
 
             @Override
             public void onFailure(final Throwable cause) {
-                LOG.debug("Transport on session {} failed", sessionId, cause);
+                LOG.debug("Binding to \"{}\" subsystem on session {} failed", subsystem, sessionId, cause);
                 deleteSession(sessionId);
             }
         }, MoreExecutors.directExecutor());