fix: include latest error in AllAttemptsErrored

Closes #186

Author: nabijaczleweli

src/client.rs

@@ -71,15 +71,6 @@ fn impl_inner_call_impl_err(
 ) -> Result<(), Error> {
     let failed_attempts = errors.len() + 1;
 
-    if retries_exhausted(failed_attempts, self_.config.retry()) {
-        warn!(
-            "call '{}' failed after {} attempts",
-            stringify!($name),
-            failed_attempts
-        );
-        return Err(Error::AllAttemptsErrored(std::mem::take(errors)));
-    }
-
     warn!(
         "call '{}' failed with {}, retry: {}/{}",
         stringify!($name),
@@ -90,6 +81,15 @@ fn impl_inner_call_impl_err(
 
     errors.push(e);
 
+    if retries_exhausted(failed_attempts, self_.config.retry()) {
+        warn!(
+            "call '{}' failed after {} attempts",
+            stringify!($name),
+            failed_attempts
+        );
+        return Err(Error::AllAttemptsErrored(std::mem::take(errors)));
+    }
+
     // Only one thread will try to recreate the client getting the write lock,
     // other eventual threads will get Err and will block at the beginning of
     // previous loop when trying to read()
@@ -107,14 +107,6 @@ fn impl_inner_call_impl_err(
                 Err(e) => {
                     let failed_attempts = errors.len() + 1;
 
-                    if retries_exhausted(failed_attempts, self_.config.retry()) {
-                        warn!(
-                            "re-creating client failed after {} attempts",
-                            failed_attempts
-                        );
-                        return Err(Error::AllAttemptsErrored(std::mem::take(errors)));
-                    }
-
                     warn!(
                         "re-creating client failed with {}, retry: {}/{}",
                         e,
@@ -123,6 +115,14 @@ fn impl_inner_call_impl_err(
                     );
 
                     errors.push(e);
+
+                    if retries_exhausted(failed_attempts, self_.config.retry()) {
+                        warn!(
+                            "re-creating client failed after {} attempts",
+                            failed_attempts
+                        );
+                        return Err(Error::AllAttemptsErrored(std::mem::take(errors)));
+                    }
                 }
             }
         }