From a3448b5c845c44ed28d28fce8746b1250fafa1d4 Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Sat, 14 Dec 2024 01:42:59 -0800 Subject: [PATCH] switch all error logs to using *_err macros --- src/api/appservice_server.rs | 10 +++---- src/api/client_server/directory.rs | 4 +-- src/api/client_server/keys.rs | 2 +- src/api/client_server/media.rs | 18 ++++--------- src/api/client_server/membership.rs | 26 +++++++++--------- src/api/client_server/profile.rs | 4 +-- src/api/client_server/room.rs | 4 +-- src/api/client_server/sync.rs | 2 +- src/api/client_server/sync/msc3575.rs | 2 +- src/api/client_server/sync/v3.rs | 6 ++--- src/api/ruma_wrapper/axum.rs | 16 +++++------ src/api/server_server.rs | 39 ++++++++++++++------------- src/database.rs | 10 +++---- src/observability/prelude.rs | 1 - src/service/admin.rs | 4 +-- src/service/globals.rs | 4 +-- src/service/media.rs | 25 +++++++++-------- src/service/pdu.rs | 2 +- src/service/pusher.rs | 12 ++++----- src/service/rooms/auth_chain.rs | 4 +-- src/service/rooms/event_handler.rs | 35 ++++++++++++------------ src/service/rooms/spaces.rs | 28 +++++++++---------- src/service/rooms/state.rs | 2 +- src/service/rooms/state_accessor.rs | 4 +-- src/service/rooms/state_cache.rs | 14 +++++----- src/service/rooms/timeline.rs | 10 +++---- src/service/sending.rs | 4 +-- src/utils/on_demand_hashmap.rs | 2 +- src/utils/proxy_protocol.rs | 4 +-- 29 files changed, 145 insertions(+), 153 deletions(-) diff --git a/src/api/appservice_server.rs b/src/api/appservice_server.rs index 49383f22..aa2683ad 100644 --- a/src/api/appservice_server.rs +++ b/src/api/appservice_server.rs @@ -62,8 +62,8 @@ where .execute(reqwest_request) .await .inspect_err(|error| { - t::warn!( - %error, + warn_err!( + error, appservice = registration.id, %destination, "Could not send request to appservice", @@ -83,7 +83,7 @@ where // TODO: handle timeout let body = response.bytes().await.unwrap_or_else(|error| { - t::warn!(%error, "Server error"); + warn_err!(error, "Server error"); Vec::new().into() }); @@ -107,8 +107,8 @@ where ); response.map(Some).map_err(|error| { - t::warn!( - %error, + warn_err!( + error, appservice = %destination, %url, "Appservice returned invalid response bytes", diff --git a/src/api/client_server/directory.rs b/src/api/client_server/directory.rs index 86731348..84873b90 100644 --- a/src/api/client_server/directory.rs +++ b/src/api/client_server/directory.rs @@ -371,8 +371,8 @@ fn room_id_to_chunk(room_id: ruma::OwnedRoomId) -> Result { _ => None, }) .map_err(|error| { - t::error!( - %error, + error_err!( + error, "Invalid room join rule event in database" ); Error::BadDatabase( diff --git a/src/api/client_server/keys.rs b/src/api/client_server/keys.rs index cee61d50..f697c6c9 100644 --- a/src/api/client_server/keys.rs +++ b/src/api/client_server/keys.rs @@ -505,7 +505,7 @@ async fn request_keys_from( match &result { Ok(_) => reset_key_request_back_off(server).await, Err(error) => { - t::debug!(%server, %error, "remote device key query failed"); + debug_err!(error, %server, "remote device key query failed"); back_off_key_requests(server.to_owned()).await; } } diff --git a/src/api/client_server/media.rs b/src/api/client_server/media.rs index 3b8a04d6..39e202af 100644 --- a/src/api/client_server/media.rs +++ b/src/api/client_server/media.rs @@ -212,7 +212,7 @@ async fn get_redirected_content( location: String, ) -> Result { let location = location.parse().map_err(|error| { - t::warn!(location, %error, "Invalid redirect location"); + warn_err!(error, location, "Invalid redirect location"); Error::BadServerResponse("Invalid redirect location") })?; let response = services() @@ -226,11 +226,7 @@ async fn get_redirected_content( .get(CONTENT_TYPE) .map(|value| { value.to_str().map_err(|error| { - t::error!( - ?value, - %error, - "Invalid Content-Type header" - ); + error_err!(error, ?value, "Invalid Content-Type header"); Error::BadServerResponse("Invalid Content-Type header") }) }) @@ -242,11 +238,7 @@ async fn get_redirected_content( .get(CONTENT_DISPOSITION) .map(|value| { ContentDisposition::try_from(value.as_bytes()).map_err(|error| { - t::error!( - ?value, - %error, - "Invalid Content-Disposition header" - ); + error_err!(error, ?value, "Invalid Content-Disposition header"); Error::BadServerResponse("Invalid Content-Disposition header") }) }) @@ -895,8 +887,8 @@ async fn get_content_thumbnail_route_ruma( resp.content.content_type, )); } - Err(error) => t::warn!( - %error, + Err(error) => warn_err!( + error, "Failed to fetch thumbnail via federation, trying to fetch \ original media and create thumbnail ourselves" ), diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs index 4d7c5cb6..cef9b792 100644 --- a/src/api/client_server/membership.rs +++ b/src/api/client_server/membership.rs @@ -537,7 +537,7 @@ async fn join_room_by_id_helper( .map(|join_rules_event| { serde_json::from_str(join_rules_event.content.get()) .map_err(|error| { - t::warn!(%error, "Invalid join rules event"); + warn_err!(error, "Invalid join rules event"); Error::bad_database( "Invalid join rules event in db.", ) @@ -956,8 +956,8 @@ async fn join_room_by_id_helper( .insert(remote_server.to_string(), signature.clone()); } Err(error) => { - t::warn!( - %error, + warn_err!( + error, server = %remote_server, event = ?signed_value, "Other server sent invalid signature in sendjoin \ @@ -999,8 +999,8 @@ async fn join_room_by_id_helper( let pdu = PduEvent::from_id_val(&event_id, value.clone()).map_err( |error| { - t::warn!( - %error, + warn_err!( + error, object = ?value, "Invalid PDU in send_join response", ); @@ -1062,7 +1062,7 @@ async fn join_room_by_id_helper( }, ) .map_err(|error| { - t::warn!(%error, "Auth check failed"); + warn_err!(error, "Auth check failed"); Error::BadRequest(ErrorKind::InvalidParam, "Auth check failed") })?; @@ -1164,8 +1164,8 @@ async fn make_join_request( return Ok((r, remote_server.clone())); } Err(error) => { - t::warn!( - %error, + warn_err!( + error, server = %remote_server, "Remote join request failed", ); @@ -1184,7 +1184,7 @@ async fn validate_and_add_event_id( ) -> Result<(OwnedEventId, CanonicalJsonObject)> { let mut value: CanonicalJsonObject = serde_json::from_str(pdu.get()) .map_err(|error| { - t::error!(%error, object = ?pdu, "Invalid PDU in server response"); + error_err!(error, object = ?pdu, "Invalid PDU in server response"); Error::BadServerResponse("Invalid PDU in server response") })?; let event_id = EventId::parse(format!( @@ -1258,9 +1258,9 @@ async fn validate_and_add_event_id( if let Err(error) = ruma::signatures::verify_event(&keys, &value, room_version) { - t::warn!( + warn_err!( + error, %event_id, - %error, ?pdu, "Event failed verification", ); @@ -1481,7 +1481,7 @@ pub(crate) async fn leave_all_rooms(user_id: &UserId) -> Result<()> { }; if let Err(error) = leave_room(user_id, &room_id, None).await { - t::warn!(%user_id, %room_id, %error, "Failed to leave room"); + warn_err!(error, %user_id, %room_id, "Failed to leave room"); } } @@ -1557,7 +1557,7 @@ pub(crate) async fn leave_room( .await?; } else { if let Err(error) = remote_leave_room(user_id, room_id).await { - t::warn!(%error, "Failed to leave room remotely"); + warn_err!(error, "Failed to leave room remotely"); // Don't tell the client about this error } diff --git a/src/api/client_server/profile.rs b/src/api/client_server/profile.rs index 3be9ab78..255c42e3 100644 --- a/src/api/client_server/profile.rs +++ b/src/api/client_server/profile.rs @@ -93,7 +93,7 @@ pub(crate) async fn set_displayname_route( .build_and_append_pdu(pdu_builder, sender_user, &room_token) .await { - t::warn!(%error, "failed to add PDU"); + warn_err!(error, "failed to add PDU"); } } @@ -205,7 +205,7 @@ pub(crate) async fn set_avatar_url_route( .build_and_append_pdu(pdu_builder, sender_user, &room_token) .await { - t::warn!(%error, "failed to add PDU"); + warn_err!(error, "failed to add PDU"); }; } diff --git a/src/api/client_server/room.rs b/src/api/client_server/room.rs index 93066238..781f5be9 100644 --- a/src/api/client_server/room.rs +++ b/src/api/client_server/room.rs @@ -400,7 +400,7 @@ pub(crate) async fn create_room_route( for event in &body.initial_state { let mut pdu_builder = event.deserialize_as::().map_err(|error| { - t::warn!(%error, "Invalid initial state event"); + warn_err!(error, "Invalid initial state event"); Error::BadRequest( ErrorKind::InvalidParam, "Invalid initial state event.", @@ -474,7 +474,7 @@ pub(crate) async fn create_room_route( invite_helper(sender_user, user_id, &room_id, None, body.is_direct) .await { - t::warn!(%error, "Invite helper failed"); + warn_err!(error, "Invite helper failed"); }; } diff --git a/src/api/client_server/sync.rs b/src/api/client_server/sync.rs index 200bcf15..0195c5ba 100644 --- a/src/api/client_server/sync.rs +++ b/src/api/client_server/sync.rs @@ -26,7 +26,7 @@ fn load_timeline( .filter_map(|x| match x { Ok(x) => Some(x), Err(error) => { - t::error!(%error, "Bad PDU in pdus_since"); + error_err!(error, "Bad PDU in pdus_since"); None } }) diff --git a/src/api/client_server/sync/msc3575.rs b/src/api/client_server/sync/msc3575.rs index 5a0b6765..d5424c61 100644 --- a/src/api/client_server/sync/msc3575.rs +++ b/src/api/client_server/sync/msc3575.rs @@ -605,7 +605,7 @@ pub(crate) async fn sync_events_v4_route( } match tokio::time::timeout(duration, watcher).await { Ok(x) => x.expect("watcher should succeed"), - Err(error) => t::debug!(%error, "Timed out"), + Err(error) => debug_err!(error, "Timed out"), }; } diff --git a/src/api/client_server/sync/v3.rs b/src/api/client_server/sync/v3.rs index aa111608..ebcc3691 100644 --- a/src/api/client_server/sync/v3.rs +++ b/src/api/client_server/sync/v3.rs @@ -279,7 +279,7 @@ pub(crate) async fn sync_events_route( } match tokio::time::timeout(duration, watcher).await { Ok(x) => x.expect("watcher should succeed"), - Err(error) => t::debug!(%error, "Timed out"), + Err(error) => debug_err!(error, "Timed out"), }; } Ok(Ra(response)) @@ -748,9 +748,9 @@ async fn load_joined_room( lazy_loaded.insert(state_key_userid); } Err(error) => { - t::error!( + error_err!( + error, event_id = %pdu.event_id, - %error, "Invalid state key for member event", ); } diff --git a/src/api/ruma_wrapper/axum.rs b/src/api/ruma_wrapper/axum.rs index 2084567b..4fc92cbe 100644 --- a/src/api/ruma_wrapper/axum.rs +++ b/src/api/ruma_wrapper/axum.rs @@ -84,7 +84,7 @@ async fn ar_from_request_inner( let query_params: QueryParams = match serde_html_form::from_str(query) { Ok(params) => params, Err(error) => { - t::error!(%error, %query, "Failed to deserialize query parameters"); + error_err!(error, %query, "Failed to deserialize query parameters"); return Err(Error::BadRequest( ErrorKind::Unknown, "Failed to read query parameters", @@ -184,8 +184,8 @@ async fn ar_from_request_inner( .extract::>>() .await .map_err(|error| { - t::warn!( - %error, + warn_err!( + error, "Missing or invalid Authorization header" ); @@ -283,7 +283,7 @@ async fn ar_from_request_inner( let keys = match keys_result { Ok(b) => b, Err(error) => { - t::warn!(%error, "Failed to fetch signing keys"); + warn_err!(error, "Failed to fetch signing keys"); return Err(Error::BadRequest( ErrorKind::forbidden(), "Failed to fetch signing keys.", @@ -309,8 +309,8 @@ async fn ar_from_request_inner( { Ok(()) => (None, None, Some(x_matrix.origin), None), Err(error) => { - t::warn!( - %error, + warn_err!( + error, origin = %x_matrix.origin, object = ?request_map, "Failed to verify JSON request" @@ -420,8 +420,8 @@ where let body = T::try_from_http_request(pieces.http_request, &pieces.path_params) .map_err(|error| { - t::warn!( - %error, + warn_err!( + error, body = ?pieces.json_body, "Request body JSON structure is incorrect" ); diff --git a/src/api/server_server.rs b/src/api/server_server.rs index 6d718c90..a2f41366 100644 --- a/src/api/server_server.rs +++ b/src/api/server_server.rs @@ -200,8 +200,8 @@ where &[MatrixVersion::V1_11], ) .map_err(|error| { - t::warn!( - %error, + warn_err!( + error, actual_destination = actual_destination_str, "Failed to find destination", ); @@ -289,7 +289,7 @@ where let mut response = response.inspect_err(|error| { if log_error == LogRequestError::Yes { - t::warn!(%error, "Could not send request"); + warn_err!(error, "Could not send request"); } })?; @@ -308,7 +308,7 @@ where t::debug!("Getting response bytes"); // TODO: handle timeout let body = response.bytes().await.unwrap_or_else(|error| { - t::warn!(%error, "Server error"); + warn_err!(error, "Server error"); Vec::new().into() }); t::debug!("Got response bytes"); @@ -345,7 +345,7 @@ where } response.map_err(|e| { - t::warn!(error = %e, "Invalid 200 response"); + warn_err!(e, "Invalid 200 response"); Error::BadServerResponse("Server returned bad 200 response.") }) } @@ -566,7 +566,7 @@ async fn request_well_known(destination: &str) -> Option { .await; t::debug!("Got well known response"); if let Err(error) = &response { - t::debug!(%error, "Failed to request .well-known"); + debug_err!(error, "Failed to request .well-known"); return None; } let text = response.ok()?.text().await; @@ -704,7 +704,7 @@ pub(crate) fn parse_incoming_pdu( ) -> Result<(OwnedEventId, CanonicalJsonObject, OwnedRoomId)> { let value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|error| { - t::warn!(%error, object = ?pdu, "Error parsing incoming event"); + warn_err!(error, object = ?pdu, "Error parsing incoming event"); Error::BadServerResponse("Invalid PDU in server response") })?; @@ -750,7 +750,7 @@ pub(crate) async fn send_transaction_message_route( for pdu in &body.pdus { let value: CanonicalJsonObject = serde_json::from_str(pdu.get()) .map_err(|error| { - t::warn!(%error, object = ?pdu, "Error parsing incoming event"); + warn_err!(error, object = ?pdu, "Error parsing incoming event"); Error::BadServerResponse("Invalid PDU in server response") })?; let room_id: OwnedRoomId = value @@ -775,7 +775,7 @@ pub(crate) async fn send_transaction_message_route( let (event_id, value, room_id) = match r { Ok(t) => t, Err(error) => { - t::warn!(%error, object = ?pdu, "Error parsing incoming event"); + warn_err!(error, object = ?pdu, "Error parsing incoming event"); continue; } }; @@ -816,7 +816,7 @@ pub(crate) async fn send_transaction_message_route( for pdu in &resolved_map { if let (event_id, Err(error)) = pdu { if matches!(error, Error::BadRequest(ErrorKind::NotFound, _)) { - t::warn!(%error, %event_id, "Incoming PDU failed"); + warn_err!(error, %event_id, "Incoming PDU failed"); } } } @@ -968,8 +968,8 @@ pub(crate) async fn send_transaction_message_route( &ev_type.to_string(), event.deserialize_as().map_err( |error| { - t::warn!( - %error, + warn_err!( + error, object = ?event.json(), "To-Device event is invalid", ); @@ -1507,7 +1507,7 @@ pub(crate) async fn create_join_event_template_route( .map(|join_rules_event| { serde_json::from_str(join_rules_event.content.get()).map_err( |error| { - t::warn!(%error, "Invalid join rules event"); + warn_err!(error, "Invalid join rules event"); Error::bad_database("Invalid join rules event in db.") }, ) @@ -1604,7 +1604,7 @@ async fn create_join_event( .map(|join_rules_event| { serde_json::from_str(join_rules_event.content.get()).map_err( |error| { - t::warn!(%error, "Invalid join rules event"); + warn_err!(error, "Invalid join rules event"); Error::bad_database("Invalid join rules event in db.") }, ) @@ -1867,7 +1867,7 @@ pub(crate) async fn create_invite_route( let pdu: PduEvent = serde_json::from_value(event.into()).map_err(|error| { - t::warn!(%error, "Invalid invite event"); + warn_err!(error, "Invalid invite event"); Error::BadRequest(ErrorKind::InvalidParam, "Invalid invite event.") })?; @@ -2101,10 +2101,11 @@ pub(crate) async fn media_download_route( }; let content_disposition = content_disposition.and_then(|s| { - s.parse().inspect_err( - |error| t::warn!(%error, "Invalid Content-Disposition in database"), - ) - .ok() + s.parse() + .inspect_err(|error| { + warn_err!(error, "Invalid Content-Disposition in database"); + }) + .ok() }); Ok(Ra(authenticated_media::get_content::v1::Response { diff --git a/src/database.rs b/src/database.rs index caa56022..5ce48dfe 100644 --- a/src/database.rs +++ b/src/database.rs @@ -848,8 +848,8 @@ impl KeyValueDatabase { ) { Ok(u) => u, Err(error) => { - t::warn!( - %error, + warn_err!( + error, user_localpart = %username, "Invalid username", ); @@ -950,8 +950,8 @@ impl KeyValueDatabase { ) { Ok(u) => u, Err(error) => { - t::warn!( - %error, + warn_err!( + error, user_localpart = %username, "Invalid username", ); @@ -1062,7 +1062,7 @@ impl KeyValueDatabase { msg(); let start = Instant::now(); if let Err(error) = services().globals.cleanup() { - t::error!(%error, "cleanup: Error"); + error_err!(error, "cleanup: Error"); } else { t::debug!( elapsed = ?start.elapsed(), diff --git a/src/observability/prelude.rs b/src/observability/prelude.rs index 80e328f6..165d9913 100644 --- a/src/observability/prelude.rs +++ b/src/observability/prelude.rs @@ -17,7 +17,6 @@ pub(crate) use tracing::Instrument; /// /// The `parent:` and `target:` arguments from the original macro are not /// supported. -#[allow(unused)] macro_rules! event_err { ($level:expr, $error:expr, $($rest:tt)+) => { ::tracing::event!( diff --git a/src/service/admin.rs b/src/service/admin.rs index 2567c9d7..07c19605 100644 --- a/src/service/admin.rs +++ b/src/service/admin.rs @@ -1068,9 +1068,9 @@ impl Service { if leave_rooms { for &user_id in &user_ids { if let Err(error) = leave_all_rooms(user_id).await { - t::warn!( + warn_err!( + error, %user_id, - %error, "failed to leave one or more rooms" ); } diff --git a/src/service/globals.rs b/src/service/globals.rs index 7b5f6ff4..83d32b74 100644 --- a/src/service/globals.rs +++ b/src/service/globals.rs @@ -502,8 +502,8 @@ impl Service { } } Err(error) => { - t::error!( - %error, + error_err!( + error, "Could not set the configured emergency password for the \ Grapevine user", ); diff --git a/src/service/media.rs b/src/service/media.rs index 2ea69782..84e5664c 100644 --- a/src/service/media.rs +++ b/src/service/media.rs @@ -110,11 +110,10 @@ impl Service { any_files = true; self.delete_by_key(thumbnail_key.clone()).await.inspect_err( |error| { - t::warn!( - thumbnail_key = utils::u8_slice_to_hex( - thumbnail_key.as_bytes() - ), - %error, + warn_err!( + error, + thumbnail_key = + utils::u8_slice_to_hex(thumbnail_key.as_bytes()), "Failed to delete thumbnail media" ); }, @@ -122,14 +121,14 @@ impl Service { } if let Some((_, key)) = - self.db.search_file_metadata(mxc, 0, 0).inspect_err( - |error| t::warn!(%error, "Failed to find original media key"), - )? + self.db.search_file_metadata(mxc, 0, 0).inspect_err(|error| { + warn_err!(error, "Failed to find original media key"); + })? { any_files = true; - self.delete_by_key(key).await.inspect_err( - |error| t::warn!(%error, "Failed to delete original media"), - )?; + self.delete_by_key(key).await.inspect_err(|error| { + warn_err!(error, "Failed to delete original media"); + })?; } if any_files { @@ -137,7 +136,7 @@ impl Service { } else { let error = Error::BadRequest(ErrorKind::NotFound, "Media not found"); - t::warn!(%error, "Failed to delete media"); + warn_err!(error, "Failed to delete media"); Err(error) } } @@ -218,7 +217,7 @@ impl Service { let image = match image::load_from_memory(file) { Ok(image) => image, Err(error) => { - t::warn!(%error, "Failed to parse source image"); + warn_err!(error, "Failed to parse source image"); return Ok(None); } }; diff --git a/src/service/pdu.rs b/src/service/pdu.rs index 2eb4a048..46593c79 100644 --- a/src/service/pdu.rs +++ b/src/service/pdu.rs @@ -474,7 +474,7 @@ pub(crate) fn gen_event_id_canonical_json( ) -> crate::Result<(OwnedEventId, CanonicalJsonObject)> { let value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|error| { - t::warn!(%error, object = ?pdu, "Error parsing incoming event"); + warn_err!(error, object = ?pdu, "Error parsing incoming event"); Error::BadServerResponse("Invalid PDU in server response") })?; diff --git a/src/service/pusher.rs b/src/service/pusher.rs index d132ea14..26d43ed9 100644 --- a/src/service/pusher.rs +++ b/src/service/pusher.rs @@ -82,7 +82,7 @@ impl Service { &[MatrixVersion::V1_0], ) .map_err(|error| { - t::warn!(%error, %destination, "Failed to find destination"); + warn_err!(error, %destination, "Failed to find destination"); Error::BadServerResponse("Invalid destination") })? .map(BytesMut::freeze); @@ -109,7 +109,7 @@ impl Service { // TODO: handle timeout let body = response.bytes().await.unwrap_or_else(|error| { - t::warn!(%error, "Server error"); + warn_err!(error, "Server error"); Vec::new().into() }); @@ -132,8 +132,8 @@ impl Service { .expect("reqwest body is valid http body"), ); response.map_err(|error| { - t::warn!( - %error, + warn_err!( + error, appservice = %destination, %url, "Push gateway returned invalid response bytes", @@ -144,8 +144,8 @@ impl Service { }) } Err(error) => { - t::warn!( - %error, + warn_err!( + error, %destination, "Could not send request to push gateway", ); diff --git a/src/service/rooms/auth_chain.rs b/src/service/rooms/auth_chain.rs index 0f54b312..ff9d8ff1 100644 --- a/src/service/rooms/auth_chain.rs +++ b/src/service/rooms/auth_chain.rs @@ -223,9 +223,9 @@ impl Service { ); } Err(error) => { - t::error!( + error_err!( + error, ?event_id, - ?error, "Could not load event in auth chain" ); } diff --git a/src/service/rooms/event_handler.rs b/src/service/rooms/event_handler.rs index 12e0fcea..f867505b 100644 --- a/src/service/rooms/event_handler.rs +++ b/src/service/rooms/event_handler.rs @@ -242,7 +242,7 @@ impl Service { .await { errors += 1; - t::warn!(%error, event_id = %prev_id, "Prev event failed"); + warn_err!(error, event_id = %prev_id, "Prev event failed"); match services() .globals .bad_event_ratelimiter @@ -380,7 +380,7 @@ impl Service { ) { Err(error) => { // Drop - t::warn!(%event_id, %error, "Dropping bad event"); + warn_err!(error, %event_id, "Dropping bad event"); return Err(Error::BadRequest( ErrorKind::InvalidParam, "Signature verification failed", @@ -733,9 +733,10 @@ impl Service { |event_id| { let res = services().rooms.timeline.get_pdu(event_id); if let Err(error) = &res { - t::error!( - %error, - %event_id, "Failed to fetch event" + error_err!( + error, + %event_id, + "Failed to fetch event" ); } res.ok().flatten() @@ -760,10 +761,10 @@ impl Service { .collect::>()?, ), Err(error) => { - t::warn!( - %error, + warn_err!( + error, "State resolution on prev events failed, either \ - an event could not be found or deserialization" + an event could not be found or deserialization" ); None } @@ -872,7 +873,7 @@ impl Service { state_at_incoming_event = Some(state); } Err(error) => { - t::warn!(%error, "Fetching state for event failed"); + warn_err!(error, "Fetching state for event failed"); return Err(error); } }; @@ -1169,7 +1170,7 @@ impl Service { let fetch_event = |id: &_| { let res = services().rooms.timeline.get_pdu(id); if let Err(error) = &res { - t::error!(%error, "Failed to fetch event"); + error_err!(error, "Failed to fetch event"); } res.ok().flatten() }; @@ -1415,9 +1416,9 @@ impl Service { } } Err(error) => { - t::warn!( + warn_err!( + error, event_id = %next_id, - %error, "Event failed auth checks", ); back_off((**next_id).to_owned()).await; @@ -1598,7 +1599,7 @@ impl Service { ) -> Result<()> { let value: CanonicalJsonObject = serde_json::from_str(pdu.get()) .map_err(|error| { - t::error!(%error, ?pdu, "Invalid PDU in server response"); + error_err!(error, ?pdu, "Invalid PDU in server response"); Error::BadServerResponse("Invalid PDU in server response") })?; @@ -1739,7 +1740,7 @@ impl Service { ) .await { - t::debug!(%error, "Failed to get server keys from cache"); + debug_err!(error, "Failed to get server keys from cache"); }; } @@ -1769,8 +1770,8 @@ impl Service { let k = match k.deserialize() { Ok(key) => key, Err(error) => { - t::warn!( - %error, + warn_err!( + error, %server, object = ?k.json(), "Failed to fetch keys from trusted server", @@ -1861,7 +1862,7 @@ impl Service { { Ok(x) => x, Err(error) => { - t::warn!(%error, "Invalid ACL event"); + warn_err!(error, "Invalid ACL event"); return Ok(()); } }; diff --git a/src/service/rooms/spaces.rs b/src/service/rooms/spaces.rs index 16ad90e8..8820dfde 100644 --- a/src/service/rooms/spaces.rs +++ b/src/service/rooms/spaces.rs @@ -184,8 +184,8 @@ impl Service { serde_json::from_str(s.content.get()) .map(|c: RoomJoinRulesEventContent| c.join_rule) .map_err(|error| { - t::error!( - %error, + error_err!( + error, "Invalid room join rule event" ); Error::BadDatabase( @@ -352,8 +352,8 @@ impl Service { serde_json::from_str(s.content.get()) .map(|c: RoomCanonicalAliasEventContent| c.alias) .map_err(|error| { - t::error!( - %error, + error_err!( + error, event_id = %s.event_id, "Invalid room canonical alias event" ); @@ -382,8 +382,8 @@ impl Service { serde_json::from_str(s.content.get()) .map(|c: RoomTopicEventContent| Some(c.topic)) .map_err(|error| { - t::error!( - %error, + error_err!( + error, event_id = %s.event_id, "Invalid room topic event" ); @@ -407,8 +407,8 @@ impl Service { == HistoryVisibility::WorldReadable }) .map_err(|error| { - t::error!( - %error, + error_err!( + error, event_id = %s.event_id, "Invalid room history visibility event" ); @@ -428,8 +428,8 @@ impl Service { c.guest_access == GuestAccess::CanJoin }) .map_err(|error| { - t::error!( - %error, + error_err!( + error, event_id = %s.event_id, "Invalid room guest access event" ); @@ -446,8 +446,8 @@ impl Service { serde_json::from_str(s.content.get()) .map(|c: RoomAvatarEventContent| c.url) .map_err(|error| { - t::error!( - %error, + error_err!( + error, event_id = %s.event_id, "Invalid room avatar event" ); @@ -471,8 +471,8 @@ impl Service { serde_json::from_str(s.content.get()) .map(|c: RoomJoinRulesEventContent| c.join_rule) .map_err(|error| { - t::error!( - %error, + error_err!( + error, event_id = %s.event_id, "Invalid room join rule event", ); diff --git a/src/service/rooms/state.rs b/src/service/rooms/state.rs index cc8a5889..13deb35a 100644 --- a/src/service/rooms/state.rs +++ b/src/service/rooms/state.rs @@ -381,7 +381,7 @@ impl Service { .map(|create_event| { serde_json::from_str::(create_event.content.get()).map_err( |error| { - t::warn!(%error, "Invalid create event"); + warn_err!(error, "Invalid create event"); Error::BadDatabase("Invalid create event in db.") }, ) diff --git a/src/service/rooms/state_accessor.rs b/src/service/rooms/state_accessor.rs index 6616e361..0ae2f885 100644 --- a/src/service/rooms/state_accessor.rs +++ b/src/service/rooms/state_accessor.rs @@ -496,8 +496,8 @@ impl Service { serde_json::from_str(s.content.get()) .map(|c: RoomNameEventContent| Some(c.name)) .map_err(|error| { - t::error!( - %error, + error_err!( + error, "Invalid room name event in database" ); Error::BadDatabase( diff --git a/src/service/rooms/state_cache.rs b/src/service/rooms/state_cache.rs index 69797a76..72ad931d 100644 --- a/src/service/rooms/state_cache.rs +++ b/src/service/rooms/state_cache.rs @@ -75,7 +75,7 @@ impl Service { .state .get_create_content::(room_id) .inspect_err(|error| { - t::warn!(%error, "Failed to get room predecessor"); + warn_err!(error, "Failed to get room predecessor"); }) .ok() .flatten() @@ -110,8 +110,8 @@ impl Service { event.get(), ) .map_err(|error| { - t::warn!( - %error, + warn_err!( + error, %event_kind, "Invalid account data event", ); @@ -215,8 +215,8 @@ impl Service { RoomAccountDataEventType::Tag, &event, ) { - t::warn!( - %error, + warn_err!( + error, "error writing m.tag account data to upgraded room" ); } @@ -293,9 +293,9 @@ impl Service { event_kind.clone(), &event, ) { - t::warn!( + warn_err!( + error, %event_kind, - %error, "error writing account data event after upgrading room" ); } diff --git a/src/service/rooms/timeline.rs b/src/service/rooms/timeline.rs index ada3fd3a..88dbd2d0 100644 --- a/src/service/rooms/timeline.rs +++ b/src/service/rooms/timeline.rs @@ -161,7 +161,7 @@ impl Service { .find_map(|x| match x { Ok(x) => Some(x), Err(error) => { - t::error!(%error, "Bad pdu in pdus_since"); + error_err!(error, "Bad pdu in pdus_since"); None } }) @@ -879,7 +879,7 @@ impl Service { |k, s| auth_events.get(&(k.clone(), s.to_owned())), ) .map_err(|error| { - t::error!(%error, "Auth check failed"); + error_err!(error, "Auth check failed"); Error::BadDatabase("Auth check failed.") })?; @@ -1340,15 +1340,15 @@ impl Service { .backfill_pdu(backfill_server, pdu, &pub_key_map) .await { - t::warn!(%error, "Failed to add backfilled pdu"); + warn_err!(error, "Failed to add backfilled pdu"); } } return Ok(()); } Err(error) => { - t::warn!( + warn_err!( + error, server = %backfill_server, - %error, "Server could not provide backfill", ); } diff --git a/src/service/sending.rs b/src/service/sending.rs index de4dadfe..19b4d376 100644 --- a/src/service/sending.rs +++ b/src/service/sending.rs @@ -267,7 +267,7 @@ impl Service { } if let Err(error) = result { - t::warn!(%error, "Marking transaction as failed"); + warn_err!(error, "Marking transaction as failed"); current_transaction_status.entry(destination).and_modify(|e| { use TransactionStatus::{Failed, Retrying, Running}; @@ -354,7 +354,7 @@ impl Service { None } Err(error) => { - t::error!(%error, "Failed to select events to send"); + error_err!(error, "Failed to select events to send"); None } } diff --git a/src/utils/on_demand_hashmap.rs b/src/utils/on_demand_hashmap.rs index 8275e8db..aa4494ef 100644 --- a/src/utils/on_demand_hashmap.rs +++ b/src/utils/on_demand_hashmap.rs @@ -199,7 +199,7 @@ impl Drop for EntryDropGuard { if let Err(error) = cleanup_sender .send(self.key.take().expect("drop should only be called once")) { - t::warn!(%error, "Failed to send cleanup message"); + warn_err!(error, "Failed to send cleanup message"); }; } } diff --git a/src/utils/proxy_protocol.rs b/src/utils/proxy_protocol.rs index 5e260f6c..278b3cb6 100644 --- a/src/utils/proxy_protocol.rs +++ b/src/utils/proxy_protocol.rs @@ -145,8 +145,8 @@ where std::io::Error::new(ErrorKind::TimedOut, e) })? .inspect_err(|error| { - t::warn!( - %error, + warn_err!( + error, "Failed to parse HAProxy protocol header" ); })?;