diff --git a/src/api/ruma_wrapper/axum.rs b/src/api/ruma_wrapper/axum.rs index 36f184fcb21c8868df2098c44f83f75ef9fa8c73..fbb45bb05b8311ace6b173a825fcd1ceff6d97e0 100644 --- a/src/api/ruma_wrapper/axum.rs +++ b/src/api/ruma_wrapper/axum.rs @@ -18,7 +18,7 @@ CanonicalJsonValue, OwnedDeviceId, OwnedServerName, UserId, }; use serde::Deserialize; -use tracing::{debug, error, warn}; +use tracing::{debug, error, trace, warn}; use super::{Ruma, RumaResponse}; use crate::{services, Error, Result}; @@ -334,9 +334,14 @@ async fn from_request(req: Request<B>, _state: &S) -> Result<Self, Self::Rejecti } let http_request = http_request.body(&*body).unwrap(); + debug!( + "{:?} {:?} {:?}", + http_request.method(), + http_request.uri(), + http_request.headers() + ); - debug!("{:?}", http_request); - + trace!("{:?} {:?} {:?}", http_request.method(), http_request.uri(), json_body); let body = T::try_from_http_request(http_request, &path_params).map_err(|e| { warn!("try_from_http_request failed: {e:?}\nPath parameters: {path_params:?}",); debug!("JSON body: {:?}", json_body); diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs index 7e798cbf2d619e577d4ee697b9057fea4ce08cf1..e598365951dc0fafec306b5852da97073a7530a3 100644 --- a/src/service/rooms/event_handler/mod.rs +++ b/src/service/rooms/event_handler/mod.rs @@ -1307,7 +1307,7 @@ pub(crate) async fn fetch_required_signing_keys<'a, E>( if server_key_ids.is_empty() { // Nothing to do, can exit early - debug!("server_key_ids is empty, not fetching any keys"); + trace!("server_key_ids is empty, not fetching any keys"); return Ok(()); } @@ -1566,7 +1566,7 @@ pub(crate) async fn fetch_join_signing_keys( }; if servers.is_empty() { - info!("We had all keys cached locally, not fetching any keys from remote servers"); + trace!("We had all keys cached locally, not fetching any keys from remote servers"); return Ok(()); } @@ -1605,7 +1605,7 @@ pub(crate) async fn fetch_join_signing_keys( .await?; } - info!("Search for signing keys done"); + debug!("Search for signing keys done"); /*if servers.is_empty() { warn!("Failed to find homeserver signing keys for the remaining servers: {servers:?}"); @@ -1722,8 +1722,6 @@ pub async fn fetch_signing_keys_for_server( } } - debug!("Loading signing keys for {origin} from our database if available"); - let mut result: BTreeMap<_, _> = services() .globals .signing_keys_for(origin)? @@ -1732,7 +1730,7 @@ pub async fn fetch_signing_keys_for_server( .collect(); if contains_all_ids(&result) { - debug!("We have all homeserver signing keys locally for {origin}, not fetching any remotely"); + trace!("We have all homeserver signing keys locally for {origin}, not fetching any remotely"); return Ok(result); }