Skip to content

refactor(client): log socket option errors instead of returning error (#2359) #2361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanmonstar merged 3 commits into from
Dec 23, 2020
Merged

refactor(client): log socket option errors instead of returning error (#2359) #2361

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fa50bf
refactor(client): log socket option errors instead of returning error…
aeryz Dec 16, 2020
36f3103
refactor(client): log the actual socket option error
aeryz Dec 17, 2020
e826746
Merge branch 'master' of https://github.com/hyperium/hyper into refac…
aeryz Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/client/connect/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,9 @@ where

let sock = c.connect().await?;

sock.set_nodelay(config.nodelay)
.map_err(ConnectError::m("tcp set_nodelay error"))?;
if let Err(e) = sock.set_nodelay(config.nodelay) {
warn!("tcp set_nodelay error: {}", e);
}

Ok(sock)
}
Expand Down Expand Up @@ -591,9 +592,9 @@ fn connect(
.map_err(ConnectError::m("tcp set_nonblocking error"))?;

if let Some(dur) = config.keep_alive_timeout {
socket
.set_keepalive(Some(dur))
.map_err(ConnectError::m("tcp set_keepalive error"))?;
if let Err(e) = socket.set_keepalive(Some(dur)) {
warn!("tcp set_keepalive error: {}", e);
}
}

bind_local_address(
Expand Down Expand Up @@ -624,21 +625,21 @@ fn connect(
};

if config.reuse_address {
socket
.set_reuseaddr(true)
.map_err(ConnectError::m("tcp set_reuse_address error"))?;
if let Err(e) = socket.set_reuseaddr(true) {
warn!("tcp set_reuse_address error: {}", e);
}
}

if let Some(size) = config.send_buffer_size {
socket
.set_send_buffer_size(size.try_into().unwrap_or(std::u32::MAX))
.map_err(ConnectError::m("tcp set_send_buffer_size error"))?;
if let Err(e) = socket.set_send_buffer_size(size.try_into().unwrap_or(std::u32::MAX)) {
warn!("tcp set_buffer_size error: {}", e);
}
}

if let Some(size) = config.recv_buffer_size {
socket
.set_recv_buffer_size(size.try_into().unwrap_or(std::u32::MAX))
.map_err(ConnectError::m("tcp set_recv_buffer_size error"))?;
if let Err(e) = socket.set_recv_buffer_size(size.try_into().unwrap_or(std::u32::MAX)) {
warn!("tcp set_recv_buffer_size error: {}", e);
}
}

let connect = socket.connect(*addr);
Expand Down