Added ability to remove connection on Error

MyJetTools · Nov 22, 2024 · ac84113 · ac84113
1 parent 9c0e9fb
commit ac84113
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/src/fl_url.rs b/src/fl_url.rs
@@ -3,6 +3,7 @@ use hyper::Method;
 use hyper::Version;
 use my_http_client::http1::MyHttpClient;
 use my_http_client::http1::MyHttpRequest;
+use my_http_client::MyHttpClientError;
 use rust_extensions::StrOrString;
 
 use std::sync::Arc;
@@ -253,7 +254,9 @@ impl FlUrl {
 
                     let response = reused_connection
                         .do_request(request, self.request_timeout)
-                        .await?;
+                        .await;
+
+                    let response = self.handle_http_response(response).await?;
                     FlUrlResponse::from_http1_response(self.url, response)
                 }
             }
@@ -279,7 +282,8 @@ impl FlUrl {
 
                     let response = reused_connection
                         .do_request(request, self.request_timeout)
-                        .await?;
+                        .await;
+                    let response = self.handle_http_response(response).await?;
 
                     FlUrlResponse::from_http1_response(self.url, response)
                 }
@@ -307,7 +311,9 @@ impl FlUrl {
 
                     let response = reused_connection
                         .do_request(request, self.request_timeout)
-                        .await?;
+                        .await;
+
+                    let response = self.handle_http_response(response).await?;
 
                     FlUrlResponse::from_http1_response(self.url, response)
                 }
@@ -330,7 +336,8 @@ impl FlUrl {
 
         let response = reused_connection
             .do_request(request, self.request_timeout)
-            .await?;
+            .await;
+        let response = self.handle_http_response(response).await?;
 
         let result = FlUrlResponse::from_http1_response(self.url, response);
 
@@ -429,4 +436,19 @@ impl FlUrl {
         let request = self.compile_request(Method::GET, None);
         self.execute(request).await
     }
+
+    async fn handle_http_response<TResult>(
+        &self,
+        result: Result<TResult, MyHttpClientError>,
+    ) -> Result<TResult, MyHttpClientError> {
+        match result {
+            Ok(result) => {
+                return Ok(result);
+            }
+            Err(err) => {
+                self.get_clients_cache().remove(&self.url).await;
+                Err(err)
+            }
+        }
+    }
 }
diff --git a/src/http_clients_cache.rs b/src/http_clients_cache.rs
@@ -152,6 +152,22 @@ impl HttpClientsCache {
 
         Ok(new_one)
     }
+
+    pub async fn remove(&self, url_builder: &UrlBuilder) {
+        let remote_endpoint = url_builder.get_remote_endpoint();
+
+        let mut write_access = self.inner.write().await;
+
+        let hash_map_key = get_https_key(remote_endpoint);
+
+        write_access.http.remove(hash_map_key.as_str());
+        write_access.https.remove(hash_map_key.as_str());
+        #[cfg(feature = "unix-socket")]
+        write_access.unix_socket.remove(hash_map_key.as_str());
+
+        #[cfg(feature = "with-ssh")]
+        write_access.ssh.remove(hash_map_key.as_str());
+    }
 }
 
 fn get_http_key(remote_endpoint: RemoteEndpoint) -> ShortString {