Better subgraph errors

jgautheron · Oct 24, 2023 · a846a1a · a846a1a
1 parent 16b38c5
commit a846a1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/crates/handler/src/service_route.rs b/crates/handler/src/service_route.rs
@@ -90,9 +90,13 @@ impl ServiceRouteTable {
             .headers(header_map.cloned().unwrap_or_default())
             .json(&request)
             .send()
-            .and_then(|res| async move { res.error_for_status() })
             .await?;
 
+        if !raw_resp.status().is_success() {
+            let body = raw_resp.text().await?;
+            return Err(anyhow::anyhow!("received non-2xx response from service \"{}\", body: \"{}\"", service, body));
+        }
+
         let mut headers: HashMap<String, Vec<String>> = HashMap::new();
 
         for (key, val) in raw_resp.headers().iter() {

diff --git a/crates/handler/src/shared_route_table.rs b/crates/handler/src/shared_route_table.rs
@@ -164,9 +164,9 @@ impl SharedRouteTable {
                             extensions: Default::default(),
                             headers: Default::default(),
                         })
-                        .unwrap(),
+                        .unwrap_or_default(),
                     )
-                    .unwrap();
+                    .unwrap_or_default();
             }
         };