From 94b8838358d40f2029b1422b88a6a1c7a70d7d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sosth=C3=A8ne=20Gu=C3=A9don?= <sosthene@nitrokey.com>
Date: Wed, 11 Sep 2024 12:08:01 +0200
Subject: [PATCH] Fix retry count

Retry count should only count retries, not the number of attempts.
A retry count of 0  should still mean 1 connection attempt.

A retry count of N should mean 1 attempt + N retry attempt
---
 pkcs11/src/backend/login.rs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkcs11/src/backend/login.rs b/pkcs11/src/backend/login.rs
index 46f12d3..9ba29fd 100644
--- a/pkcs11/src/backend/login.rs
+++ b/pkcs11/src/backend/login.rs
@@ -256,6 +256,12 @@ impl LoginCtx {
         let delay = Duration::from_secs(delay_seconds);
 
         loop {
+            if retry_count == retry_limit {
+                error!(
+                    "Retry count exceeded after {retry_limit} attempts, instance is unreachable"
+                );
+                return Err(ApiError::InstanceRemoved.into());
+            }
             retry_count += 1;
             let api_call_clone = api_call.clone();
             match api_call_clone(&instance.config) {
@@ -271,12 +277,8 @@ impl LoginCtx {
                 | Err(apis::Error::ResponseError(err @ ResponseContent { status: 503, .. }))
                 | Err(apis::Error::ResponseError(err @ ResponseContent { status: 412, .. })) => {
                     instance.bump_failed();
-                    if retry_count == retry_limit {
-                        error!("Retry count exceeded after {retry_limit} attempts, instance is unreachable: {:?}",err.status);
-                        return Err(ApiError::InstanceRemoved.into());
-                    }
 
-                    warn!("Connection attempt {retry_count} failed: IO error connecting to the instance, {:?}, retrying in {delay_seconds}s", err.status);
+                    warn!("Connection attempt {retry_count} failed: Status error connecting to the instance, {:?}, retrying in {delay_seconds}s", err.status);
                     thread::sleep(delay);
                     if let Some(new_conf) = self.get_config_user_mode(&user_mode) {
                         instance = new_conf;
@@ -291,11 +293,6 @@ impl LoginCtx {
                     ) =>
                 {
                     instance.bump_failed();
-                    if retry_count == retry_limit {
-                        error!("Retry count exceeded after {retry_limit} attempts, instance is unreachable: {err}");
-                        return Err(ApiError::InstanceRemoved.into());
-                    }
-
                     warn!("Connection attempt {retry_count} failed: IO error connecting to the instance, {err}, retrying in {delay_seconds}s");
                     thread::sleep(delay);
                     if let Some(new_conf) = self.get_config_user_mode(&user_mode) {