Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Return last connection error from connect_tcp

Browse Source
This commit is contained in:
link2xt
2023-01-19 16:42:15 +00:00
parent c4c4c977a6
commit 9adb9ab5f4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/net.rs
View File

@@ -4,7 +4,7 @@ use std::pin::Pin;
use std::str::FromStr; use std::str::FromStr;
use std::time::Duration; use std::time::Duration;
use anyhow::{Context as _, Result}; use anyhow::{Context as _, Error, Result};
use tokio::net::{lookup_host, TcpStream}; use tokio::net::{lookup_host, TcpStream};
use tokio::time::timeout; use tokio::time::timeout;
use tokio_io_timeout::TimeoutStream; use tokio_io_timeout::TimeoutStream;
@@ -119,6 +119,7 @@ pub(crate) async fn connect_tcp(
load_cache: bool, load_cache: bool,
) -> Result<Pin<Box<TimeoutStream<TcpStream>>>> { ) -> Result<Pin<Box<TimeoutStream<TcpStream>>>> {
let mut tcp_stream = None; let mut tcp_stream = None;
let mut last_error = None;
for resolved_addr in lookup_host_with_cache(context, host, port, load_cache).await? { for resolved_addr in lookup_host_with_cache(context, host, port, load_cache).await? {
match connect_tcp_inner(resolved_addr, timeout_val).await { match connect_tcp_inner(resolved_addr, timeout_val).await {
@@ -131,12 +132,17 @@ pub(crate) async fn connect_tcp(
context, context,
"Failed to connect to {}: {:#}.", resolved_addr, err "Failed to connect to {}: {:#}.", resolved_addr, err
); );
last_error = Some(err);
} }
} }
} }
let tcp_stream = let tcp_stream = match tcp_stream {
tcp_stream.with_context(|| format!("failed to connect to {}:{}", host, port))?; Some(tcp_stream) => tcp_stream,
None => {
return Err(last_error.unwrap_or_else(|| Error::msg("no DNS resolution results")));
}
};
// Disable Nagle's algorithm. // Disable Nagle's algorithm.
tcp_stream.set_nodelay(true)?; tcp_stream.set_nodelay(true)?;