Skip to content

Commit 513e490

Browse files
committed
middleware::log_request: Simplify RequestLine struct
1 parent 419899d commit 513e490

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

src/middleware/log_request.rs

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,7 @@ pub(super) struct LogRequests();
1717

1818
impl Middleware for LogRequests {
1919
fn after(&self, req: &mut dyn RequestExt, res: AfterResult) -> AfterResult {
20-
let response_time = req.extensions().find::<ResponseTime>().unwrap();
21-
22-
println!(
23-
"{}",
24-
RequestLine {
25-
req,
26-
res: &res,
27-
response_time,
28-
}
29-
);
20+
println!("{}", RequestLine { req, res: &res });
3021

3122
res
3223
}
@@ -62,13 +53,14 @@ pub(crate) fn get_log_message(req: &dyn RequestExt, key: &'static str) -> String
6253
struct RequestLine<'r> {
6354
req: &'r dyn RequestExt,
6455
res: &'r AfterResult,
65-
response_time: &'r ResponseTime,
6656
}
6757

6858
impl Display for RequestLine<'_> {
6959
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
7060
let mut line = LogLine::new(f);
7161

62+
let response_time = self.req.extensions().find::<ResponseTime>().unwrap();
63+
7264
let status = self.res.as_ref().map(|res| res.status());
7365
let status = status.unwrap_or(StatusCode::INTERNAL_SERVER_ERROR);
7466

@@ -95,7 +87,7 @@ impl Display for RequestLine<'_> {
9587
}
9688

9789
line.add_quoted_field("fwd", request_header(self.req, "x-real-ip"))?;
98-
line.add_field("service", self.response_time)?;
90+
line.add_field("service", response_time)?;
9991
line.add_field("status", status.as_str())?;
10092
line.add_quoted_field("user_agent", request_header(self.req, header::USER_AGENT))?;
10193

@@ -109,7 +101,7 @@ impl Display for RequestLine<'_> {
109101
line.add_quoted_field("error", err)?;
110102
}
111103

112-
if self.response_time.as_millis() > SLOW_REQUEST_THRESHOLD_MS {
104+
if response_time.as_millis() > SLOW_REQUEST_THRESHOLD_MS {
113105
line.add_marker("SLOW REQUEST")?;
114106
}
115107

0 commit comments

Comments
 (0)