Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 17:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ignore error from set_read_timeout (#3243)

Browse source
This commit is contained in:
Antioch Peverell 2020-02-25 20:23:32 +00:00 committed by GitHub
parent 6855241a56
commit 8a15007c8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
p2p/src/conn.rs
View file

@ -81,9 +81,7 @@ macro_rules! try_break {
macro_rules! try_header { macro_rules! try_header {
($res:expr, $conn: expr) => {{ ($res:expr, $conn: expr) => {{
$conn let _ = $conn.set_read_timeout(Some(HEADER_IO_TIMEOUT));
.set_read_timeout(Some(HEADER_IO_TIMEOUT))
.expect("set timeout");
try_break!($res) try_break!($res)
}}; }};
} }
@ -301,9 +299,7 @@ where
// check the read end // check the read end
match try_header!(read_header(&mut reader, version), &reader) { match try_header!(read_header(&mut reader, version), &reader) {
Some(MsgHeaderWrapper::Known(header)) => { Some(MsgHeaderWrapper::Known(header)) => {
reader let _ = reader.set_read_timeout(Some(BODY_IO_TIMEOUT));
.set_read_timeout(Some(BODY_IO_TIMEOUT))
.expect("set timeout");
let msg = Message::from_header(header, &mut reader, version); let msg = Message::from_header(header, &mut reader, version);
trace!( trace!(
@ -357,9 +353,7 @@ where
.name("peer_write".to_string()) .name("peer_write".to_string())
.spawn(move || { .spawn(move || {
let mut retry_send = Err(()); let mut retry_send = Err(());
writer let _ = writer.set_write_timeout(Some(BODY_IO_TIMEOUT));
.set_write_timeout(Some(BODY_IO_TIMEOUT))
.expect("set timeout");
loop { loop {
let maybe_data = retry_send.or_else(|_| send_rx.recv_timeout(CHANNEL_TIMEOUT)); let maybe_data = retry_send.or_else(|_| send_rx.recv_timeout(CHANNEL_TIMEOUT));
retry_send = Err(()); retry_send = Err(());