fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-05-28 18:21:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix panics while logging (#140)

Browse Source 
* Fix panic and logging

* Fix style
This commit is contained in:
Pierre Krieger 2018-03-15 18:03:39 +01:00 committed by GitHub
parent 064706be39
commit 18e1727842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libp2p-dns/src/lib.rs
View File

@ -201,8 +201,11 @@ fn resolve_dns(
};
let future = resolver.resolve(name).and_then(move |addrs| {
trace!(target: "libp2p-dns", "DNS component resolution: {} => {:?}",
debug_name.expect("trace log level was enabled"), addrs);
if log_enabled!(target: "libp2p-dns", Level::Trace) {
trace!(target: "libp2p-dns", "DNS component resolution: {} => {:?}",
debug_name.expect("trace log level was enabled"), addrs);
}
addrs
.into_iter()
.filter_map(move |addr| match (addr, ty) {

11
libp2p-identify/src/protocol.rs
View File

@ -145,10 +145,13 @@ where
.map(|(msg, _)| msg)
.map_err(|(err, _)| err)
.and_then(|msg| {
debug!(target: "libp2p-identify", "Received identify message from {:?}",
observed_addr_log
.expect("Programmer error: expected `observed_addr_log' to be \
non-None since debug log level is enabled"));
if log_enabled!(target: "libp2p-identify", Level::Debug) {
debug!(target: "libp2p-identify", "Received identify message from {:?}",
observed_addr_log
.expect("Programmer error: expected `observed_addr_log' to be \
non-None since debug log level is enabled"));
}
if let Some(msg) = msg {
let (info, observed_addr) = match parse_proto_msg(msg) {
Ok(v) => v,

9
libp2p-ping/src/lib.rs
View File

@ -186,8 +186,13 @@ where
match message {
Message::Ping(payload, finished) => {
// Ping requested by the user through the `Pinger`.
debug!(target: "libp2p-ping", "Sending ping to {:?} with payload {:?}",
remote_addr.expect("debug log level is enabled"), payload);
if log_enabled!(target: "libp2p-ping", Level::Debug) {
debug!(target: "libp2p-ping", "Sending ping to {:?} with \
payload {:?}",
remote_addr.expect("debug log level is enabled"),
payload);
}
expected_pongs.insert(payload.clone(), finished);
Box::new(
sink.send(payload)