fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-07-03 11:41:34 +00:00
Code Issues Projects Releases Wiki Activity

fix(core/choice): log on dial and fix listen log

Browse Source 
- Fixes typo in `<OrTransport as Transport>::listen_on` using the word "dial" instead of "listen_on".
- Adds logging to `<OrTransport as Transport>::dial`.

Follow-up to https://github.com/libp2p/rust-libp2p/pull/4133

Pull-Request: #4164.
This commit is contained in:
Max Inden
2023-07-10 10:47:31 +09:00
committed by GitHub
parent b4c7dfca63
commit 2671375cc4
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/transport/choice.rs
View File

@ -53,14 +53,14 @@ where
addr: Multiaddr, addr: Multiaddr,
) -> Result<(), TransportError<Self::Error>> { ) -> Result<(), TransportError<Self::Error>> {
trace!( trace!(
"Attempting to dial {} using {}", "Attempting to listen on {} using {}",
addr, addr,
std::any::type_name::<A>() std::any::type_name::<A>()
); );
let addr = match self.0.listen_on(id, addr) { let addr = match self.0.listen_on(id, addr) {
Err(TransportError::MultiaddrNotSupported(addr)) => { Err(TransportError::MultiaddrNotSupported(addr)) => {
debug!( debug!(
"Failed to dial {} using {}", "Failed to listen on {} using {}",
addr, addr,
std::any::type_name::<A>() std::any::type_name::<A>()
); );
@ -70,14 +70,14 @@ where
}; };
trace!( trace!(
"Attempting to dial {} using {}", "Attempting to listen on {} using {}",
addr, addr,
std::any::type_name::<B>() std::any::type_name::<B>()
); );
let addr = match self.1.listen_on(id, addr) { let addr = match self.1.listen_on(id, addr) {
Err(TransportError::MultiaddrNotSupported(addr)) => { Err(TransportError::MultiaddrNotSupported(addr)) => {
debug!( debug!(
"Failed to dial {} using {}", "Failed to listen on {} using {}",
addr, addr,
std::any::type_name::<B>() std::any::type_name::<B>()
); );
@ -94,17 +94,41 @@ where
} }
fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> { fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
trace!(
"Attempting to dial {} using {}",
addr,
std::any::type_name::<A>()
);
let addr = match self.0.dial(addr) { let addr = match self.0.dial(addr) {
Ok(connec) => return Ok(EitherFuture::First(connec)), Ok(connec) => return Ok(EitherFuture::First(connec)),
Err(TransportError::MultiaddrNotSupported(addr)) => addr, Err(TransportError::MultiaddrNotSupported(addr)) => {
debug!(
"Failed to dial {} using {}",
addr,
std::any::type_name::<A>()
);
addr
}
Err(TransportError::Other(err)) => { Err(TransportError::Other(err)) => {
return Err(TransportError::Other(Either::Left(err))) return Err(TransportError::Other(Either::Left(err)))
} }
}; };
trace!(
"Attempting to dial {} using {}",
addr,
std::any::type_name::<A>()
);
let addr = match self.1.dial(addr) { let addr = match self.1.dial(addr) {
Ok(connec) => return Ok(EitherFuture::Second(connec)), Ok(connec) => return Ok(EitherFuture::Second(connec)),
Err(TransportError::MultiaddrNotSupported(addr)) => addr, Err(TransportError::MultiaddrNotSupported(addr)) => {
debug!(
"Failed to dial {} using {}",
addr,
std::any::type_name::<A>()
);
addr
}
Err(TransportError::Other(err)) => { Err(TransportError::Other(err)) => {
return Err(TransportError::Other(Either::Right(err))) return Err(TransportError::Other(Either::Right(err)))
} }