Skip to content

Commit 2fedde4

Browse files
remove duplication of log print, by printing empty metadata_length string if none has been added to request extensions
2 parents 5db332e + ceea6f0 commit 2fedde4

File tree

1 file changed

+20
-31
lines changed

1 file changed

+20
-31
lines changed

src/middleware/log_request.rs

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,26 @@ impl Handler for LogRequests {
3131
let response_time =
3232
response_time.as_secs() * 1000 + u64::from(response_time.subsec_nanos()) / 1_000_000;
3333

34-
if let Some(metadata_length) = req.mut_extensions().pop::<u64>() {
35-
print!(
36-
"at={level} method={method} path=\"{path}\" \
37-
request_id={request_id} fwd=\"{ip}\" service={time_ms}ms \
38-
status={status} user_agent=\"{user_agent}\"\
39-
metadata_length={metadata_length}",
40-
level = level,
41-
method = req.method(),
42-
path = FullPath(req),
43-
ip = request_header(req, "X-Real-Ip"),
44-
time_ms = response_time,
45-
user_agent = request_header(req, "User-Agent"),
46-
request_id = request_header(req, "X-Request-Id"),
47-
status = response_code,
48-
metadata_length = metadata_length,
49-
);
50-
} else {
51-
print!(
52-
"at={level} method={method} path=\"{path}\" \
53-
request_id={request_id} fwd=\"{ip}\" service={time_ms}ms \
54-
status={status} user_agent=\"{user_agent}\"",
55-
level = level,
56-
method = req.method(),
57-
path = FullPath(req),
58-
ip = request_header(req, "X-Real-Ip"),
59-
time_ms = response_time,
60-
user_agent = request_header(req, "User-Agent"),
61-
request_id = request_header(req, "X-Request-Id"),
62-
status = response_code,
63-
);
64-
}
34+
let metadata_length = req
35+
.extensions()
36+
.find::<u64>()
37+
.map_or(String::new(), |l| format!(" metadata_length={}", l));
38+
39+
print!(
40+
"at={level} method={method} path=\"{path}\" \
41+
request_id={request_id} fwd=\"{ip}\" service={time_ms}ms \
42+
status={status} user_agent=\"{user_agent}\"\
43+
metadata_length={metadata_length}",
44+
level = level,
45+
method = req.method(),
46+
path = FullPath(req),
47+
ip = request_header(req, "X-Real-Ip"),
48+
time_ms = response_time,
49+
user_agent = request_header(req, "User-Agent"),
50+
request_id = request_header(req, "X-Request-Id"),
51+
status = response_code,
52+
metadata_length = metadata_length,
53+
);
6554

6655
if let Err(ref e) = res {
6756
print!(" error=\"{}\"", e.description());

0 commit comments

Comments
 (0)