Merge pull request #61 from dfinity/igornovg/fix-crash-v2

Fix error-cause-related crash, update deps
dfinity · Jan 20, 2025 · 0f307a9 · 0f307a9
2 parents 47b64a0 + 18b4064
commit 0f307a9
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/routing/error_cause.rs b/src/routing/error_cause.rs
@@ -294,16 +294,16 @@ impl ErrorClientFacing {
 // Creates the response from ErrorClientFacing
 impl IntoResponse for ErrorClientFacing {
     fn into_response(self) -> Response {
-        let error_context = ERROR_CONTEXT.get();
+        let request_type = ERROR_CONTEXT.try_with(|x| *x).unwrap_or_default();
 
         // Return an HTML error page if it was an HTTP request
-        let body = match error_context {
+        let body = match request_type {
             RequestType::Http => format!("{}\n", self.html()),
             _ => format!("error: {}\ndetails: {}", self, self.details()),
         };
 
         let mut resp = (self.status_code(), body).into_response();
-        if error_context == RequestType::Http {
+        if request_type == RequestType::Http {
             resp.headers_mut().insert(CONTENT_TYPE, CONTENT_TYPE_HTML);
         }
         resp

diff --git a/src/routing/mod.rs b/src/routing/mod.rs
@@ -64,14 +64,17 @@ impl From<CanisterId> for Principal {
     }
 }
 
-#[derive(Debug, Clone, Copy, Display, PartialEq, Eq, PartialOrd, Ord, Hash, IntoStaticStr)]
+#[derive(
+    Debug, Default, Clone, Copy, Display, PartialEq, Eq, PartialOrd, Ord, Hash, IntoStaticStr,
+)]
 #[strum(serialize_all = "snake_case")]
 pub enum RequestType {
     Http,
     Health,
     Registrations,
     #[strum(to_string = "{0}")]
     Api(RequestTypeApi),
+    #[default]
     Unknown,
 }