gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

verify_reachable_ports: Handle errors without expect() (#10298)

Browse Source 
automerge
This commit is contained in:
Michael Vines
2020-05-28 14:16:53 -07:00
committed by GitHub
parent e68621b8bb
commit 0a373149dd
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net-utils/src/lib.rs
View File

@ -121,8 +121,12 @@ pub fn verify_reachable_ports(
let (sender, receiver) = channel(); let (sender, receiver) = channel();
std::thread::spawn(move || { std::thread::spawn(move || {
debug!("Waiting for incoming connection on tcp/{}", port); debug!("Waiting for incoming connection on tcp/{}", port);
let _ = tcp_listener.incoming().next().expect("tcp incoming failed"); match tcp_listener.incoming().next() {
sender.send(()).expect("send failure"); Some(_) => sender
.send(())
.unwrap_or_else(|err| warn!("send failure: {}", err)),
None => warn!("tcp incoming failed"),
}
}); });
match receiver.recv_timeout(Duration::from_secs(5)) { match receiver.recv_timeout(Duration::from_secs(5)) {
Ok(_) => { Ok(_) => {
@ -152,8 +156,12 @@ pub fn verify_reachable_ports(
std::thread::spawn(move || { std::thread::spawn(move || {
let mut buf = [0; 1]; let mut buf = [0; 1];
debug!("Waiting for incoming datagram on udp/{}", port); debug!("Waiting for incoming datagram on udp/{}", port);
let _ = udp_socket.recv(&mut buf).expect("udp recv failure"); match udp_socket.recv(&mut buf) {
sender.send(()).expect("send failure"); Ok(_) => sender
.send(())
.unwrap_or_else(|err| warn!("send failure: {}", err)),
Err(err) => warn!("udp recv failure: {}", err),
}
}); });
match receiver.recv_timeout(Duration::from_secs(5)) { match receiver.recv_timeout(Duration::from_secs(5)) {
Ok(_) => { Ok(_) => {