diff --git a/common/clients/multi-tcp-client/src/connection_manager/mod.rs b/common/clients/multi-tcp-client/src/connection_manager/mod.rs index a3ee712392..1ff7cde685 100644 --- a/common/clients/multi-tcp-client/src/connection_manager/mod.rs +++ b/common/clients/multi-tcp-client/src/connection_manager/mod.rs @@ -68,7 +68,7 @@ impl ConnectionManager { Poll::Ready(conn) => conn, }; - println!("We managed to reconnect!"); + debug!("Managed to reconnect to {}!", self.address); self.state = ConnectionState::Writing(ConnectionWriter::new(new_connection)); } @@ -80,7 +80,7 @@ impl ConnectionManager { // TODO: is this true? can we fail to write to a connection while it still remains open and valid? Ok(res) => Ok(res), Err(e) => { - println!("Creating connection reconnector!"); + trace!("Creating connection reconnector!"); self.state = ConnectionState::Reconnecting(ConnectionReconnector::new( self.address, self.reconnection_backoff, diff --git a/common/clients/multi-tcp-client/src/lib.rs b/common/clients/multi-tcp-client/src/lib.rs index c5c46bf359..cb9432f010 100644 --- a/common/clients/multi-tcp-client/src/lib.rs +++ b/common/clients/multi-tcp-client/src/lib.rs @@ -1,4 +1,5 @@ use crate::connection_manager::ConnectionManager; +use log::*; use std::collections::HashMap; use std::io; use std::net::SocketAddr; @@ -53,7 +54,6 @@ impl Client { } pub async fn send(&mut self, address: SocketAddr, message: &[u8]) -> io::Result<()> { - println!("sending {:?}", str::from_utf8(message)); if !self.connections_managers.contains_key(&address) { return Err(io::Error::new( io::ErrorKind::AddrNotAvailable, @@ -96,24 +96,22 @@ mod tests { self.received_buf.clone() } + // this is only used in tests so slightly higher logging levels are fine async fn listen_until(mut self, addr: SocketAddr, close_message: &[u8]) -> Self { let mut listener = tokio::net::TcpListener::bind(addr).await.unwrap(); - println!("started"); - let (mut socket, _) = listener.accept().await.unwrap(); - println!("connected"); loop { let mut buf = [0u8; 1024]; match socket.read(&mut buf).await { Ok(n) if n == 0 => { - println!("Remote connection closed"); + info!("Remote connection closed"); return self; } Ok(n) => { - println!("received ({}) - {:?}", n, str::from_utf8(buf[..n].as_ref())); + info!("received ({}) - {:?}", n, str::from_utf8(buf[..n].as_ref())); if buf[..n].as_ref() == close_message { - println!("closing..."); + info!("closing..."); socket.shutdown(std::net::Shutdown::Both).unwrap(); return self; } else {