From 18e7880e580d3727ad03606a7c2a1e789a9a532b Mon Sep 17 00:00:00 2001 From: metamuffin Date: Fri, 16 Aug 2024 13:09:11 +0200 Subject: better error handling --- server/client-lib/src/network/sync.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'server/client-lib/src') diff --git a/server/client-lib/src/network/sync.rs b/server/client-lib/src/network/sync.rs index 3a475e01..bf2359cb 100644 --- a/server/client-lib/src/network/sync.rs +++ b/server/client-lib/src/network/sync.rs @@ -61,13 +61,13 @@ impl Network { info!("Connecting: host={host:?} port={port}"); let stream = TcpStream::connect((host, port))?; - stream.set_nodelay(true).unwrap(); + stream.set_nodelay(true)?; - let (mut sock, _) = client_tls_with_config(request, stream, None, None).unwrap(); + let (mut sock, _) = client_tls_with_config(request, stream, None, None)?; match sock.get_mut() { - MaybeTlsStream::Plain(s) => s.set_nonblocking(true).unwrap(), - MaybeTlsStream::Rustls(s) => s.sock.set_nonblocking(true).unwrap(), + MaybeTlsStream::Plain(s) => s.set_nonblocking(true)?, + MaybeTlsStream::Rustls(s) => s.sock.set_nonblocking(true)?, _ => todo!(), }; @@ -131,16 +131,17 @@ impl Network { for packet in self.queue_out.drain(..) { debug!("-> {packet:?}"); if self.use_bincode { - self.sock.write(Message::Binary( - bincode::encode_to_vec(&packet, BINCODE_CONFIG).unwrap(), - ))?; + self.sock.write(Message::Binary(bincode::encode_to_vec( + &packet, + BINCODE_CONFIG, + )?))?; } else { self.sock - .write(Message::Text(serde_json::to_string(&packet).unwrap()))?; + .write(Message::Text(serde_json::to_string(&packet)?))?; } } - self.sock.flush().unwrap(); + self.sock.flush()?; Ok(()) } } -- cgit v1.2.3-70-g09d2