Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: report first error instead of the last on connection failure

Browse Source 
First result has higher priority
as it is the one prioritized by DNS
or used recently, while the last
tried server may never work at all.
This commit is contained in:
link2xt
2024-07-27 02:24:12 +00:00
parent 76a43c8de6
commit 14d57e780b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/net.rs
View File

@@ -73,7 +73,7 @@ pub(crate) async fn connect_tcp(
timeout_val: Duration,
load_cache: bool,
) -> Result<Pin<Box<TimeoutStream<TcpStream>>>> {
let mut last_error = None;
let mut first_error = None;
for resolved_addr in
lookup_host_with_cache(context, host, port, timeout_val, load_cache).await?
@@ -87,12 +87,12 @@ pub(crate) async fn connect_tcp(
context,
"Failed to connect to {}: {:#}.", resolved_addr, err
);
last_error = Some(err);
first_error.get_or_insert(err);
}
}
}
Err(last_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
Err(first_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
}
pub(crate) async fn connect_tls(
@@ -103,7 +103,7 @@ pub(crate) async fn connect_tls(
strict_tls: bool,
alpns: &[&str],
) -> Result<TlsStream<Pin<Box<TimeoutStream<TcpStream>>>>> {
let mut last_error = None;
let mut first_error = None;
for resolved_addr in
lookup_host_with_cache(context, host, port, timeout_val, strict_tls).await?
@@ -118,12 +118,12 @@ pub(crate) async fn connect_tls(
}
Err(err) => {
warn!(context, "Failed to connect to {resolved_addr}: {err:#}.");
last_error = Some(err);
first_error.get_or_insert(err);
}
}
}
Err(last_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
Err(first_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
}
async fn connect_starttls_imap_inner(
@@ -162,7 +162,7 @@ pub(crate) async fn connect_starttls_imap(
timeout_val: Duration,
strict_tls: bool,
) -> Result<TlsStream<Pin<Box<TimeoutStream<TcpStream>>>>> {
let mut last_error = None;
let mut first_error = None;
for resolved_addr in
lookup_host_with_cache(context, host, port, timeout_val, strict_tls).await?
@@ -177,12 +177,12 @@ pub(crate) async fn connect_starttls_imap(
}
Err(err) => {
warn!(context, "Failed to connect to {resolved_addr}: {err:#}.");
last_error = Some(err);
first_error.get_or_insert(err);
}
}
}
Err(last_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
Err(first_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
}
async fn connect_starttls_smtp_inner(
@@ -210,7 +210,7 @@ pub(crate) async fn connect_starttls_smtp(
timeout_val: Duration,
strict_tls: bool,
) -> Result<TlsStream<Pin<Box<TimeoutStream<TcpStream>>>>> {
let mut last_error = None;
let mut first_error = None;
for resolved_addr in
lookup_host_with_cache(context, host, port, timeout_val, strict_tls).await?
@@ -225,10 +225,10 @@ pub(crate) async fn connect_starttls_smtp(
}
Err(err) => {
warn!(context, "Failed to connect to {resolved_addr}: {err:#}.");
last_error = Some(err);
first_error.get_or_insert(err);
}
}
}
Err(last_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
Err(first_error.unwrap_or_else(|| format_err!("no DNS resolution results for {host}")))
}