Adjust several log levels; cleanup unformatted log call.
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
@@ -71,7 +71,11 @@ pub(crate) async fn get_context_route(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !visible {
|
if !visible {
|
||||||
debug_warn!(req_evt = ?event_id, ?base_id, ?room_id, "Event requested by {sender_user} but is not allowed to see it, returning 404");
|
debug_warn!(
|
||||||
|
req_evt = ?event_id, ?base_id, ?room_id,
|
||||||
|
"Event requested by {sender_user} but is not allowed to see it."
|
||||||
|
);
|
||||||
|
|
||||||
return Err!(Request(NotFound("Event not found.")));
|
return Err!(Request(NotFound("Event not found.")));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ where
|
|||||||
name = "ar",
|
name = "ar",
|
||||||
level = "debug",
|
level = "debug",
|
||||||
skip(services),
|
skip(services),
|
||||||
err(level = "warn")
|
err(level = "debug")
|
||||||
ret,
|
ret,
|
||||||
)]
|
)]
|
||||||
async fn from_request(
|
async fn from_request(
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ pub(super) struct Auth {
|
|||||||
#[tracing::instrument(
|
#[tracing::instrument(
|
||||||
level = "trace",
|
level = "trace",
|
||||||
skip(services, request, json_body),
|
skip(services, request, json_body),
|
||||||
err(level = "warn"),
|
err(level = "debug"),
|
||||||
ret
|
ret
|
||||||
)]
|
)]
|
||||||
pub(super) async fn auth(
|
pub(super) async fn auth(
|
||||||
@@ -309,7 +309,9 @@ async fn auth_server(
|
|||||||
.server_keys
|
.server_keys
|
||||||
.get_verify_key(origin, &x_matrix.key)
|
.get_verify_key(origin, &x_matrix.key)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| err!(Request(Forbidden(warn!("Failed to fetch signing keys: {e}")))))?;
|
.map_err(|e| {
|
||||||
|
err!(Request(Forbidden(debug_warn!("Failed to fetch signing keys: {e}"))))
|
||||||
|
})?;
|
||||||
|
|
||||||
let keys: PubKeys = [(x_matrix.key.to_string(), key.key)].into();
|
let keys: PubKeys = [(x_matrix.key.to_string(), key.key)].into();
|
||||||
let keys: PubKeyMap = [(origin.as_str().into(), keys)].into();
|
let keys: PubKeyMap = [(origin.as_str().into(), keys)].into();
|
||||||
@@ -367,7 +369,7 @@ async fn parse_x_matrix(request: &mut Request) -> Result<XMatrix> {
|
|||||||
| _ => "Unknown header-related error",
|
| _ => "Unknown header-related error",
|
||||||
};
|
};
|
||||||
|
|
||||||
err!(Request(Forbidden(warn!("{msg}: {e}"))))
|
err!(Request(Forbidden(debug_warn!("{msg}: {e}"))))
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
Ok(x_matrix)
|
Ok(x_matrix)
|
||||||
|
|||||||
Reference in New Issue
Block a user