Skip to content

Commit 2671375

Browse files
authored
fix(core/choice): log on dial and fix listen log
- 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.
1 parent b4c7dfc commit 2671375

File tree

1 file changed

+30
-6
lines changed

1 file changed

+30
-6
lines changed

core/src/transport/choice.rs

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ where
5353
addr: Multiaddr,
5454
) -> Result<(), TransportError<Self::Error>> {
5555
trace!(
56-
"Attempting to dial {} using {}",
56+
"Attempting to listen on {} using {}",
5757
addr,
5858
std::any::type_name::<A>()
5959
);
6060
let addr = match self.0.listen_on(id, addr) {
6161
Err(TransportError::MultiaddrNotSupported(addr)) => {
6262
debug!(
63-
"Failed to dial {} using {}",
63+
"Failed to listen on {} using {}",
6464
addr,
6565
std::any::type_name::<A>()
6666
);
@@ -70,14 +70,14 @@ where
7070
};
7171

7272
trace!(
73-
"Attempting to dial {} using {}",
73+
"Attempting to listen on {} using {}",
7474
addr,
7575
std::any::type_name::<B>()
7676
);
7777
let addr = match self.1.listen_on(id, addr) {
7878
Err(TransportError::MultiaddrNotSupported(addr)) => {
7979
debug!(
80-
"Failed to dial {} using {}",
80+
"Failed to listen on {} using {}",
8181
addr,
8282
std::any::type_name::<B>()
8383
);
@@ -94,17 +94,41 @@ where
9494
}
9595

9696
fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
97+
trace!(
98+
"Attempting to dial {} using {}",
99+
addr,
100+
std::any::type_name::<A>()
101+
);
97102
let addr = match self.0.dial(addr) {
98103
Ok(connec) => return Ok(EitherFuture::First(connec)),
99-
Err(TransportError::MultiaddrNotSupported(addr)) => addr,
104+
Err(TransportError::MultiaddrNotSupported(addr)) => {
105+
debug!(
106+
"Failed to dial {} using {}",
107+
addr,
108+
std::any::type_name::<A>()
109+
);
110+
addr
111+
}
100112
Err(TransportError::Other(err)) => {
101113
return Err(TransportError::Other(Either::Left(err)))
102114
}
103115
};
104116

117+
trace!(
118+
"Attempting to dial {} using {}",
119+
addr,
120+
std::any::type_name::<A>()
121+
);
105122
let addr = match self.1.dial(addr) {
106123
Ok(connec) => return Ok(EitherFuture::Second(connec)),
107-
Err(TransportError::MultiaddrNotSupported(addr)) => addr,
124+
Err(TransportError::MultiaddrNotSupported(addr)) => {
125+
debug!(
126+
"Failed to dial {} using {}",
127+
addr,
128+
std::any::type_name::<A>()
129+
);
130+
addr
131+
}
108132
Err(TransportError::Other(err)) => {
109133
return Err(TransportError::Other(Either::Right(err)))
110134
}

0 commit comments

Comments
 (0)