fix: earlier drops
This commit is contained in:
@@ -156,6 +156,7 @@ impl reqwest_middleware::Middleware for RetryMiddleware {
|
||||
attempt,
|
||||
)
|
||||
{
|
||||
drop(resp);
|
||||
tokio::time::sleep(delay).await;
|
||||
attempt = attempt.saturating_add(1);
|
||||
continue;
|
||||
@@ -170,6 +171,7 @@ impl reqwest_middleware::Middleware for RetryMiddleware {
|
||||
&& let Some(delay) =
|
||||
calculate_retry_timeout(None, attempt)
|
||||
{
|
||||
drop(err);
|
||||
tokio::time::sleep(delay).await;
|
||||
attempt = attempt.saturating_add(1);
|
||||
continue;
|
||||
|
||||
+14
-11
@@ -27,15 +27,15 @@ impl DbType {
|
||||
headers.insert(reqwest::header::IF_NONE_MATCH, etag);
|
||||
}
|
||||
|
||||
let response = http_client
|
||||
.get(self.url())
|
||||
.headers(headers)
|
||||
.timeout(Duration::MAX)
|
||||
.send()
|
||||
.await?
|
||||
.error_for_status()?;
|
||||
let request =
|
||||
http_client.get(self.url()).headers(headers).timeout(Duration::MAX);
|
||||
drop(http_client);
|
||||
|
||||
if response.status() == reqwest::StatusCode::NOT_MODIFIED {
|
||||
let response = request.send().await?.error_for_status()?;
|
||||
|
||||
let status = response.status();
|
||||
if status == reqwest::StatusCode::NOT_MODIFIED {
|
||||
drop(response);
|
||||
tracing::info!(
|
||||
"Latest {} database is already cached at {}",
|
||||
self.name(),
|
||||
@@ -44,11 +44,11 @@ impl DbType {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if response.status() != reqwest::StatusCode::OK {
|
||||
if status != reqwest::StatusCode::OK {
|
||||
return Err(eyre!(
|
||||
"HTTP status error ({}) for url ({})",
|
||||
response.status(),
|
||||
response.url()
|
||||
status,
|
||||
response.url(),
|
||||
));
|
||||
}
|
||||
|
||||
@@ -169,6 +169,9 @@ impl DbType {
|
||||
))),
|
||||
);
|
||||
}
|
||||
drop(response);
|
||||
#[cfg(feature = "tui")]
|
||||
drop(tx);
|
||||
|
||||
writer.flush().await.wrap_err_with(move || {
|
||||
compact_str::format_compact!(
|
||||
|
||||
@@ -161,6 +161,7 @@ async fn download_ipdb(
|
||||
|
||||
let asn_task = spawn(ipdb::DbType::Asn, config.asn_enabled());
|
||||
let geodb_task = spawn(ipdb::DbType::Geo, config.geolocation_enabled());
|
||||
drop(spawn);
|
||||
|
||||
Ok(output::UseIpDb { asn: asn_task.await?, geo: geodb_task.await? })
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user