magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

log more details for panic in tower handler

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-15 04:40:14 +00:00
parent 038b71fc9d
commit 838e4b9d8d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/router/layers.rs
View file

@ -5,7 +5,7 @@ use axum::{
Router, Router,
}; };
use axum_client_ip::SecureClientIpSource; use axum_client_ip::SecureClientIpSource;
use conduit::{Result, Server}; use conduit::{error, Result, Server};
use http::{ use http::{
header::{self, HeaderName}, header::{self, HeaderName},
HeaderValue, Method, StatusCode, HeaderValue, Method, StatusCode,
@ -149,7 +149,7 @@ fn cors_layer(_server: &Server) -> CorsLayer {
fn body_limit_layer(server: &Server) -> DefaultBodyLimit { DefaultBodyLimit::max(server.config.max_request_size) } fn body_limit_layer(server: &Server) -> DefaultBodyLimit { DefaultBodyLimit::max(server.config.max_request_size) }
#[allow(clippy::needless_pass_by_value)] #[allow(clippy::needless_pass_by_value)]
#[tracing::instrument(skip_all)] #[tracing::instrument(skip_all, name = "panic")]
fn catch_panic(err: Box<dyn Any + Send + 'static>) -> http::Response<http_body_util::Full<bytes::Bytes>> { fn catch_panic(err: Box<dyn Any + Send + 'static>) -> http::Response<http_body_util::Full<bytes::Bytes>> {
conduit_service::services() conduit_service::services()
.server .server
@ -165,17 +165,17 @@ fn catch_panic(err: Box<dyn Any + Send + 'static>) -> http::Response<http_body_u
"Unknown internal server error occurred.".to_owned() "Unknown internal server error occurred.".to_owned()
}; };
error!("{details:#}");
let body = serde_json::json!({ let body = serde_json::json!({
"errcode": "M_UNKNOWN", "errcode": "M_UNKNOWN",
"error": "M_UNKNOWN: Internal server error occurred", "error": "M_UNKNOWN: Internal server error occurred",
"details": details, "details": details,
}) });
.to_string();
http::Response::builder() http::Response::builder()
.status(StatusCode::INTERNAL_SERVER_ERROR) .status(StatusCode::INTERNAL_SERVER_ERROR)
.header(header::CONTENT_TYPE, "application/json") .header(header::CONTENT_TYPE, "application/json")
.body(http_body_util::Full::from(body)) .body(http_body_util::Full::from(body.to_string()))
.expect("Failed to create response for our panic catcher?") .expect("Failed to create response for our panic catcher?")
} }