backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-19 00:31:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch all error logs to using *_err macros

Browse source
This commit is contained in:
Olivia Lee 2024-12-14 01:42:59 -08:00
parent d28135f7ca
commit a3448b5c84
No known key found for this signature in database
GPG key ID: 54D568A15B9CD1F9
29 changed files with 145 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/api/appservice_server.rs
View file

@ -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",

4
src/api/client_server/directory.rs
View file

@ -371,8 +371,8 @@ fn room_id_to_chunk(room_id: ruma::OwnedRoomId) -> Result<PublicRoomsChunk> {
_ => None,
})
.map_err(|error| {
t::error!(
%error,
error_err!(
error,
"Invalid room join rule event in database"
);
Error::BadDatabase(

2
src/api/client_server/keys.rs
View file

@ -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;
}
}

18
src/api/client_server/media.rs
View file

@ -212,7 +212,7 @@ async fn get_redirected_content(
location: String,
) -> Result<authenticated_media_fed::Content> {
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"
),

26
src/api/client_server/membership.rs
View file

@ -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
}

4
src/api/client_server/profile.rs
View file

@ -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");
};
}

4
src/api/client_server/room.rs
View file

@ -400,7 +400,7 @@ pub(crate) async fn create_room_route(
for event in &body.initial_state {
let mut pdu_builder =
event.deserialize_as::<PduBuilder>().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");
};
}

2
src/api/client_server/sync.rs
View file

@ -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
}
})

2
src/api/client_server/sync/msc3575.rs
View file

@ -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"),
};
}

6
src/api/client_server/sync/v3.rs
View file

@ -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",
);
}

16
src/api/ruma_wrapper/axum.rs
View file

@ -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::<TypedHeader<Authorization<XMatrix>>>()
.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"
);

39
src/api/server_server.rs
View file

@ -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<String> {
.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 {