Skip to content

Commit

Permalink
fix(core/choice): log on dial and fix listen log
Browse files Browse the repository at this point in the history
- 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 #4133

Pull-Request: #4164.
  • Loading branch information
mxinden committed Jul 10, 2023
1 parent b4c7dfc commit 2671375
Showing 1 changed file with 30 additions and 6 deletions.
36 changes: 30 additions & 6 deletions core/src/transport/choice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ where
addr: Multiaddr,
) -> Result<(), TransportError<Self::Error>> {
trace!(
"Attempting to dial {} using {}",
"Attempting to listen on {} using {}",
addr,
std::any::type_name::<A>()
);
let addr = match self.0.listen_on(id, addr) {
Err(TransportError::MultiaddrNotSupported(addr)) => {
debug!(
"Failed to dial {} using {}",
"Failed to listen on {} using {}",
addr,
std::any::type_name::<A>()
);
Expand All @@ -70,14 +70,14 @@ where
};

trace!(
"Attempting to dial {} using {}",
"Attempting to listen on {} using {}",
addr,
std::any::type_name::<B>()
);
let addr = match self.1.listen_on(id, addr) {
Err(TransportError::MultiaddrNotSupported(addr)) => {
debug!(
"Failed to dial {} using {}",
"Failed to listen on {} using {}",
addr,
std::any::type_name::<B>()
);
Expand All @@ -94,17 +94,41 @@ where
}

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) {
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)) => {
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) {
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)) => {
return Err(TransportError::Other(Either::Right(err)))
}
Expand Down

0 comments on commit 2671375

Please sign in to comment.