handle error better for rpc

nervosnetwork · Jul 18, 2024 · 2c62afe · 2c62afe
1 parent 6aab4bf
commit 2c62afe
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/rpc/src/server.rs b/rpc/src/server.rs
@@ -253,11 +253,15 @@ async fn handle_jsonrpc<T: Default + Metadata>(
     };
 
     if let Some(response) = result.await {
-        (
-            [(axum::http::header::CONTENT_TYPE, "application/json")],
-            serde_json::to_string(&response).unwrap(),
-        )
-            .into_response()
+        serde_json::to_string(&response)
+            .map(|json| {
+                (
+                    [(axum::http::header::CONTENT_TYPE, "application/json")],
+                    json,
+                )
+                    .into_response()
+            })
+            .unwrap_or_else(|_| StatusCode::INTERNAL_SERVER_ERROR.into_response())
     } else {
         StatusCode::NO_CONTENT.into_response()
     }