Skip to content

Commit 8419b64

Browse files
author
Devdutt Shenoi
committed
ci: clippy suggestions
1 parent 200624a commit 8419b64

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/audit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ impl AuditLogBuilder {
221221
return;
222222
}
223223
let error = err.to_string();
224-
let error = error.is_empty().then(|| error);
224+
let error = error.is_empty().then_some(error);
225225
self.response = Some(ResponseLog { status_code, error });
226226
}
227227

src/handlers/http/audit.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ pub async fn audit_log_middleware(
7070
}
7171
}
7272

73-
let conn = req.connection_info();
7473
let headers = req
7574
.headers()
7675
.iter()
@@ -85,18 +84,24 @@ pub async fn audit_log_middleware(
8584
.ok()
8685
}
8786
});
88-
log_builder.set_request(req.method().as_str(), req.path(), conn.scheme(), headers);
87+
log_builder.set_request(
88+
req.method().as_str(),
89+
req.path(),
90+
req.connection_info().scheme(),
91+
headers,
92+
);
8993

9094
log_builder.set_actor(
91-
conn.realip_remote_addr().unwrap_or_default(),
95+
req.connection_info()
96+
.realip_remote_addr()
97+
.unwrap_or_default(),
9298
req.headers()
9399
.get("User-Agent")
94100
.and_then(|a| a.to_str().ok())
95101
.unwrap_or_default(),
96102
username,
97103
authorization_method,
98104
);
99-
drop(conn);
100105

101106
let res = next.call(req).await;
102107

src/kafka.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,7 @@ pub async fn setup_integration() {
278278
// Constructs a log for each kafka request
279279
let mut log_builder = AuditLogBuilder::default();
280280
log_builder.set_actor(
281-
CONFIG
282-
.parseable
283-
.kafka_host
284-
.as_ref()
285-
.map(|s| s.as_str())
286-
.unwrap_or(""),
281+
CONFIG.parseable.kafka_host.as_deref().unwrap_or(""),
287282
"Kafka Client",
288283
"",
289284
"",

0 commit comments

Comments
 (0)