mirror of
https://github.com/element-hq/matrix-authentication-service.git
synced 2026-08-22 18:31:02 +00:00
mas-cli: log the requester on the request log line
Add `requester=...` to the `http.server.response` log line, reading the `Requester` recorded on the request's `LogContext`.
This commit is contained in:
@@ -191,7 +191,12 @@ async fn log_response_middleware(
|
||||
|
||||
let response = next.run(request).await;
|
||||
|
||||
let Some(stats) = LogContext::maybe_with(LogContext::stats) else {
|
||||
let Some((stats, requester)) = LogContext::maybe_with(|ctx| {
|
||||
(
|
||||
ctx.stats(),
|
||||
ctx.requester().cloned().map(tracing::field::display),
|
||||
)
|
||||
}) else {
|
||||
tracing::error!("Missing log context for request, this is a bug!");
|
||||
return response;
|
||||
};
|
||||
@@ -200,14 +205,17 @@ async fn log_response_middleware(
|
||||
match status_code.as_u16() {
|
||||
100..=399 => tracing::info!(
|
||||
name: "http.server.response",
|
||||
{ requester = requester },
|
||||
"\"{method} {path} HTTP/{version}\" {status_code} {user_agent:?} [{stats}]",
|
||||
),
|
||||
400..=499 => tracing::warn!(
|
||||
name: "http.server.response",
|
||||
{ requester = requester },
|
||||
"\"{method} {path} HTTP/{version}\" {status_code} {user_agent:?} [{stats}]",
|
||||
),
|
||||
500..=599 => tracing::error!(
|
||||
name: "http.server.response",
|
||||
{ requester = requester },
|
||||
"\"{method} {path} HTTP/{version}\" {status_code} {user_agent:?} [{stats}]",
|
||||
),
|
||||
_ => { /* This shouldn't happen */ }
|
||||
|
||||
Reference in New Issue
Block a user