Skip to content

Commit dad5c87

Browse files
authored
fix(client): log socket option errors instead of returning error (#2361)
Closes #2359
1 parent 3b3077d commit dad5c87

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

src/client/connect/http.rs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,9 @@ where
338338

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

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

344345
Ok(sock)
345346
}
@@ -591,9 +592,9 @@ fn connect(
591592
.map_err(ConnectError::m("tcp set_nonblocking error"))?;
592593

593594
if let Some(dur) = config.keep_alive_timeout {
594-
socket
595-
.set_keepalive(Some(dur))
596-
.map_err(ConnectError::m("tcp set_keepalive error"))?;
595+
if let Err(e) = socket.set_keepalive(Some(dur)) {
596+
warn!("tcp set_keepalive error: {}", e);
597+
}
597598
}
598599

599600
bind_local_address(
@@ -624,21 +625,21 @@ fn connect(
624625
};
625626

626627
if config.reuse_address {
627-
socket
628-
.set_reuseaddr(true)
629-
.map_err(ConnectError::m("tcp set_reuse_address error"))?;
628+
if let Err(e) = socket.set_reuseaddr(true) {
629+
warn!("tcp set_reuse_address error: {}", e);
630+
}
630631
}
631632

632633
if let Some(size) = config.send_buffer_size {
633-
socket
634-
.set_send_buffer_size(size.try_into().unwrap_or(std::u32::MAX))
635-
.map_err(ConnectError::m("tcp set_send_buffer_size error"))?;
634+
if let Err(e) = socket.set_send_buffer_size(size.try_into().unwrap_or(std::u32::MAX)) {
635+
warn!("tcp set_buffer_size error: {}", e);
636+
}
636637
}
637638

638639
if let Some(size) = config.recv_buffer_size {
639-
socket
640-
.set_recv_buffer_size(size.try_into().unwrap_or(std::u32::MAX))
641-
.map_err(ConnectError::m("tcp set_recv_buffer_size error"))?;
640+
if let Err(e) = socket.set_recv_buffer_size(size.try_into().unwrap_or(std::u32::MAX)) {
641+
warn!("tcp set_recv_buffer_size error: {}", e);
642+
}
642643
}
643644

644645
let connect = socket.connect(*addr);

0 commit comments

Comments
 (0)