Handle HTTP errors

Handle and log http errors separately.
rpcpool · Apr 13, 2023 · 72f94cf · 72f94cf
1 parent 2101e81
commit 72f94cf
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/nft_ingester/src/error/mod.rs b/nft_ingester/src/error/mod.rs
@@ -48,6 +48,8 @@ pub enum IngesterError {
     UnrecoverableTaskError,
     #[error("Cache Storage Write Error {0}")]
     CacheStorageWriteError(String),
+    #[error("HttpError {status_code}")]
+    HttpError { status_code: String },
 }
 
 impl From<reqwest::Error> for IngesterError {

diff --git a/nft_ingester/src/tasks/common/mod.rs b/nft_ingester/src/tasks/common/mod.rs
@@ -55,12 +55,16 @@ impl DownloadMetadataTask {
         let client = ClientBuilder::new()
             .timeout(Duration::from_secs(3))
             .build()?;
-        let val: serde_json::Value = Client::get(&client, uri) // Need to check for malicious sites ?
+        let response = Client::get(&client, uri) // Need to check for malicious sites ?
             .send()
-            .await?
-            .json()
             .await?;
-        Ok(val)
+
+        if response.status() != reqwest::StatusCode::OK {
+            Err(IngesterError::HttpError{ status_code: response.status().as_str().to_string() })
+        } else {
+            let val: serde_json::Value = response.json().await?;
+            Ok(val)
+        }
     }
 }
 

diff --git a/nft_ingester/src/tasks/mod.rs b/nft_ingester/src/tasks/mod.rs
@@ -123,18 +123,29 @@ impl TaskManager {
                 task.errors = Set(Some(e.to_string()));
                 task.locked_until = Set(None);
 
-                if e == IngesterError::BatchInitNetworkingError {
-                    // Network errors are common for off-chain JSONs.
-                    // Logging these as errors is far too noisy.
-                    metric! {
-                        statsd_count!("ingester.bgtask.network_error", 1, "type" => task_name);
-                    }
-                    warn!("Task failed due to network error: {}",  e);
-                } else {
-                    metric! {
-                        statsd_count!("ingester.bgtask.error", 1, "type" => task_name);
+                match e {
+                    IngesterError::BatchInitNetworkingError => {
+                        // Network errors are common for off-chain JSONs.
+                        // Logging these as errors is far too noisy.
+                        metric! {
+                            statsd_count!("ingester.bgtask.network_error", 1, "type" => task_name);
+                        }
+                        warn!("Task failed due to network error: {}",  e);
+                    },
+                    IngesterError::HttpError { ref status_code } => {
+                        metric! {
+                            statsd_count!("ingester.bgtask.http_error", 1, 
+                                "status" => &status_code,
+                                "type" => task_name);
+                        }
+                        warn!("Task failed due to HTTP error: {}",  e);
+                    },
+                    _ => {
+                        metric! {
+                            statsd_count!("ingester.bgtask.error", 1, "type" => task_name);
+                        }
+                        error!("Task Run Error: {}",  e);
                     }
-                    error!("Task Run Error: {}",  e);
                 }
             }
         }