[FIX] cetmix_tower_server: Connection test

Ensure all attempts are used if the connection fails.
cetmix · Jan 17, 2025 · 2a5d80b · 2a5d80b
1 parent 4a49208
commit 2a5d80b
Showing 1 changed file with 28 additions and 21 deletions.
diff --git a/cetmix_tower_server/models/cetmix_tower.py b/cetmix_tower_server/models/cetmix_tower.py
@@ -146,25 +146,32 @@ def server_check_ssh_connection(
 
         # Try connecting multiple times
         for attempt in range(1, attempts + 1):
-            result = server.test_ssh_connection(
-                raise_on_error=False,
-                return_notification=False,
-                try_command=try_command,
-                try_file=try_file,
-            )
-            if result.get("status") == 0:
-                return {
-                    "exit_code": 0,
-                    "message": _("Connection successful."),
-                }
-            if attempt == attempts:
-                return {
-                    "exit_code": SSH_CONNECTION_ERROR,
-                    "message": _(
-                        "Failed to connect after %(attempts)s attempts. "
-                        "Error: %(err)s",
-                        attempts=attempts,
-                        err=result.get("error", ""),
-                    ),
-                }
+            try:
+                result = server.test_ssh_connection(
+                    raise_on_error=True,
+                    return_notification=False,
+                    try_command=try_command,
+                    try_file=try_file,
+                )
+                if result.get("status") == 0:
+                    return {
+                        "exit_code": 0,
+                        "message": _("Connection successful."),
+                    }
+                if attempt == attempts:
+                    return {
+                        "exit_code": SSH_CONNECTION_ERROR,
+                        "message": _(
+                            "Failed to connect after %(attempts)s attempts. "
+                            "Error: %(err)s",
+                            attempts=attempts,
+                            err=result.get("error", ""),
+                        ),
+                    }
+            except Exception as e:
+                if attempt == attempts:
+                    return {
+                        "exit_code": SSH_CONNECTION_ERROR,
+                        "message": _(f"Failed to connect. Error: {e}"),
+                    }
             time.sleep(wait_time)