Categorize ssh tunnel exceptions

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Aug 5, 2021 · 251c34f · 251c34f
1 parent 9f3e06a
commit 251c34f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...src/main/java/org/eclipse/ditto/connectivity/service/messaging/tunnel/SshTunnelActor.java b/...src/main/java/org/eclipse/ditto/connectivity/service/messaging/tunnel/SshTunnelActor.java
@@ -45,6 +45,7 @@
 import org.eclipse.ditto.connectivity.service.config.DittoConnectivityConfig;
 import org.eclipse.ditto.connectivity.service.config.MonitoringConfig;
 import org.eclipse.ditto.connectivity.service.messaging.ConnectivityStatusResolver;
+import org.eclipse.ditto.connectivity.service.messaging.internal.ConnectionFailure;
 import org.eclipse.ditto.connectivity.service.messaging.internal.RetrieveAddressStatus;
 import org.eclipse.ditto.connectivity.service.messaging.monitoring.logs.ConnectionLogger;
 import org.eclipse.ditto.connectivity.service.messaging.monitoring.logs.ConnectionLoggerRegistry;
@@ -290,7 +291,7 @@ private ResourceStatus getResourceStatus() {
             statusDetail = "ssh tunnel established.";
         } else if (error != null) {
             status = connectivityStatusResolver.resolve(error);
-            statusDetail =  String.format("ssh tunnel failed (reason: %s).", error.getMessage());
+            statusDetail = ConnectionFailure.determineFailureDescription(Instant.now(), error, "SSH tunnel failed");
         } else {
             status = ConnectivityStatus.CLOSED;
             statusDetail = "ssh tunnel closed.";

diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
@@ -36,6 +36,11 @@ ditto {
       {exceptionName: "com.rabbitmq.client.AuthenticationFailureException", messagePattern: ".*"}
       {exceptionName: "com.rabbitmq.client.ShutdownSignalException", messagePattern: ".*"}
       {exceptionName: "javax.net.ssl.SSLException", messagePattern: ".*"}
+      # SSH Tunnel
+      {exceptionName: "java.nio.channels.UnresolvedAddressException", messagePattern: ".*"}
+      {exceptionName: "org.apache.sshd.common.SshException", messagePattern: ".*authentication.*"}
+      {exceptionName: "java.net.ConnectException: Connection refused", messagePattern: ".*"}
+      {exceptionName: "java.lang.RuntimeException", messagePattern: ".*load key from.*"} //thrown when private key could not be loaded
     ]
 
     user-indicated-errors-extended = []