fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-13 10:01:25 +00:00
Code Issues Projects Releases Wiki Activity

Remove all targets from log statements. (#195)

Browse Source 
The default uses crate + module path anyway, so `target` has been
redundant, causes more work when renaming crates and makes log
lines longer.
This commit is contained in:
Toralf Wittner
2018-05-17 15:14:13 +02:00
committed by GitHub
parent cb800624f5
commit 86a21fc43e
22 changed files with 158 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
websocket/src/browser.rs
View File

@ -76,7 +76,7 @@ impl Transport for BrowserWsConfig {
Err(_) => return Err((self, original_addr)),
};
debug!(target: "libp2p-websocket", "Dialing {}", original_addr);
debug!("Dialing {}", original_addr);
// Create the JS `WebSocket` object.
let websocket = {

22
websocket/src/desktop.rs
View File

@ -94,14 +94,14 @@ where
}
};
debug!(target: "libp2p-websocket", "Listening on {}", new_addr);
debug!("Listening on {}", new_addr);
let listen = inner_listen.map::<_, fn(_) -> _>(|stream| {
// Upgrade the listener to websockets like the websockets library requires us to do.
let upgraded = stream.and_then(|(stream, mut client_addr)| {
// Need to suffix `/ws` to each client address.
client_addr.append(AddrComponent::WS);
debug!(target: "libp2p-websocket", "Incoming connection from {}", client_addr);
debug!("Incoming connection from {}", client_addr);
stream
.into_ws()
@ -112,8 +112,7 @@ where
.accept()
.map_err(|err| IoError::new(IoErrorKind::Other, err))
.map(|(client, _http_headers)| {
debug!(target: "libp2p-websocket", "Upgraded incoming connection \
to websockets");
debug!("Upgraded incoming connection to websockets");
// Plug our own API on top of the `websockets` API.
let framed_data = client
@ -156,22 +155,22 @@ where
Some(AddrComponent::WS) => false,
Some(AddrComponent::WSS) => true,
_ => {
trace!(target: "libp2p-websocket", "Ignoring dial attempt for {} because it is \
not a websocket multiaddr", original_addr);
trace!("Ignoring dial attempt for {} because it is not a websocket multiaddr",
original_addr);
return Err((self, original_addr));
}
};
debug!(target: "libp2p-websocket", "Dialing {} through inner transport", inner_addr);
debug!("Dialing {} through inner transport", inner_addr);
let ws_addr = client_addr_to_ws(&inner_addr, is_wss);
let inner_dial = match self.transport.dial(inner_addr) {
Ok(d) => d,
Err((transport, old_addr)) => {
warn!(target: "libp2p-websocket", "Failed to dial {} because {} is not supported \
by the underlying transport", original_addr,
old_addr);
warn!("Failed to dial {} because {} is not supported by the underlying transport",
original_addr,
old_addr);
return Err((
WsConfig {
transport: transport,
@ -189,8 +188,7 @@ where
.async_connect_on(connec)
.map_err(|err| IoError::new(IoErrorKind::Other, err))
.map(|(client, _)| {
debug!(target: "libp2p-websocket", "Upgraded outgoing connection to \
websockets");
debug!("Upgraded outgoing connection to websockets");
// Plug our own API on top of the API of the websockets library.
let framed_data = client