Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(core): add logs for OrTransport when trying addresses #4133

Merged
merged 7 commits into from
Jul 5, 2023
Merged

feat(core): add logs for OrTransport when trying addresses #4133

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e943967
add std::any::type_name logs for OrTransport when trying addresses
tcoratger Jun 29, 2023
a9c27b2
improving logs
tcoratger Jun 29, 2023
1e5268f
Update core/src/transport/choice.rs
tcoratger Jun 30, 2023
fb06f43
Update core/src/transport/choice.rs
tcoratger Jun 30, 2023
459dd46
Merge branch 'master' into OrTransport
tcoratger Jun 30, 2023
7535a26
Merge branch 'master' into OrTransport
tcoratger Jul 1, 2023
e9bd184
Merge branch 'master' into OrTransport
mxinden Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions core/src/transport/choice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use crate::either::EitherFuture;
use crate::transport::{ListenerId, Transport, TransportError, TransportEvent};
use either::Either;
use futures::future;
use log::{debug, trace};
use multiaddr::Multiaddr;
use std::{pin::Pin, task::Context, task::Poll};

Expand Down Expand Up @@ -51,13 +52,37 @@ where
id: ListenerId,
addr: Multiaddr,
) -> Result<(), TransportError<Self::Error>> {
trace!(
"Attempting to dial {} using {}",
addr,
std::any::type_name::<A>()
);
let addr = match self.0.listen_on(id, addr) {
Err(TransportError::MultiaddrNotSupported(addr)) => addr,
Err(TransportError::MultiaddrNotSupported(addr)) => {
debug!(
"Failed to dial {} using {}",
addr,
std::any::type_name::<A>()
);
addr
}
res => return res.map_err(|err| err.map(Either::Left)),
};

trace!(
"Attempting to dial {} using {}",
addr,
std::any::type_name::<B>()
);
let addr = match self.1.listen_on(id, addr) {
Err(TransportError::MultiaddrNotSupported(addr)) => addr,
Err(TransportError::MultiaddrNotSupported(addr)) => {
debug!(
"Failed to dial {} using {}",
addr,
std::any::type_name::<B>()
);
addr
}
res => return res.map_err(|err| err.map(Either::Right)),
};

Expand Down