handle 'canConnectViaSocket' for reconnect

* Should go to connecting state with MISCONFIGURED status Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Jul 30, 2021 · c030e39 · c030e39
1 parent 917bf5b
commit c030e39
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/...rvice/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java b/...rvice/src/main/java/org/eclipse/ditto/connectivity/service/messaging/BaseClientActor.java
@@ -1004,6 +1004,7 @@ private void reconnect() {
         } else {
             logger.info("Socket is closed, scheduling a reconnect.");
             cleanupResourcesForConnection();
+            throw newConnectionFailedException(DittoHeaders.empty());
         }
     }
 
@@ -1076,7 +1077,14 @@ private FSM.State<BaseClientState, BaseClientData> connectionTimedOut(final Base
                     logger.info("Connection requires SSH tunnel, start tunnel.");
                     tunnelActor.tell(SshTunnelActor.TunnelControl.START_TUNNEL, getSender());
                 } else {
-                    reconnect();
+                    try {
+                        reconnect();
+                    } catch (final ConnectionFailedException e){
+                        return goToConnecting(reconnectTimeoutStrategy.getNextTimeout())
+                                .using(data.setConnectionStatus(ConnectivityStatus.MISCONFIGURED)
+                                        .setConnectionStatusDetails(e.getMessage())
+                                        .resetSession());
+                    }
                 }
                 return goToConnecting(reconnectTimeoutStrategy.getNextTimeout()).using(data.resetSession()
                         .setConnectionStatus(ConnectivityStatus.FAILED)
@@ -1114,15 +1122,21 @@ private State<BaseClientState, BaseClientData> connectAfterTunnelStarted(final C
 
         if (data.getSessionSenders().isEmpty()) {
             logger.info("Reconnecting after ssh tunnel was established.");
-            reconnect();
+            try {
+                reconnect();
+                return stay();
+            } catch (final ConnectionFailedException e){
+                return goToConnecting(reconnectTimeoutStrategy.getNextTimeout())
+                        .using(data.setConnectionStatus(ConnectivityStatus.MISCONFIGURED)
+                                .setConnectionStatusDetails(e.getMessage())
+                                .resetSession());
+            }
         } else {
             logger.info("Connecting initially after tunnel was established.");
             final ActorRef sender = data.getSessionSenders().get(0).first();
             final DittoHeaders dittoHeaders = data.getSessionSenders().get(0).second();
-            doOpenConnection(data, sender, dittoHeaders);
+            return doOpenConnection(data, sender, dittoHeaders);
         }
-
-        return stay();
     }
 
     private State<BaseClientState, BaseClientData> testConnectionAfterTunnelStarted(final Control control,