diff --git a/src/blockchain/filter.rs b/src/blockchain/filter.rs index 7d1ca0a..be524bc 100644 --- a/src/blockchain/filter.rs +++ b/src/blockchain/filter.rs @@ -36,14 +36,14 @@ impl DnsFilter for BlockchainFilter { subdomain = String::from(parts[2]); } } - debug!("Searching record type '{:?}', name '{}' for domain '{}'", &qtype, &subdomain, &search); + trace!("Searching record type '{:?}', name '{}' for domain '{}'", &qtype, &subdomain, &search); let data = self.context.lock().unwrap().chain.get_domain_info(&search); let zone = parts[0].to_owned(); match data { None => { - debug!("Not found data for domain {}", &search); if self.context.lock().unwrap().chain.is_zone_in_blockchain(&zone) { + trace!("Not found data for domain {}", &search); // Create DnsPacket let mut packet = DnsPacket::new(); packet.questions.push(DnsQuestion::new(String::from(qname), qtype)); @@ -55,7 +55,7 @@ impl DnsFilter for BlockchainFilter { } } Some(data) => { - debug!("Found data for domain {}", &search); + trace!("Found data for domain {}", &search); let mut data: DomainData = match serde_json::from_str(&data) { Err(_) => { return None; } Ok(data) => { data } diff --git a/src/p2p/network.rs b/src/p2p/network.rs index 8a08738..766e8ed 100644 --- a/src/p2p/network.rs +++ b/src/p2p/network.rs @@ -72,11 +72,11 @@ impl Network { // Process each event. for event in events.iter() { - trace!("Event for socket {} is {:?}", event.token().0, &event); + //trace!("Event for socket {} is {:?}", event.token().0, &event); // We can use the token we previously provided to `register` to determine for which socket the event is. match event.token() { SERVER => { - debug!("Event for server socket {} is {:?}", event.token().0, &event); + //debug!("Event for server socket {} is {:?}", event.token().0, &event); // If this is an event for the server, it means a connection is ready to be accepted. let connection = server.accept(); match connection { @@ -104,7 +104,7 @@ impl Network { stream.shutdown(Shutdown::Both).unwrap_or_else(|e|{ warn!("Error in shutdown, {}", e); }); warn!("Detected connection loop, ignoring IP: {}", &address.ip()); } else { - debug!("Accepted connection from: {} to local IP: {}", address, local_ip); + //debug!("Accepted connection from: {} to local IP: {}", address, local_ip); let token = next(&mut unique_token); poll.registry().register(&mut stream, token, Interest::READABLE).expect("Error registering poll"); peers.add_peer(token, Peer::new(address, stream, State::Connected, true)); @@ -208,10 +208,10 @@ fn handle_connection_event(context: Arc>, peers: &mut Peers, regi let data = data.unwrap(); match Message::from_bytes(data) { Ok(message) => { - let m = format!("{:?}", &message); + //let m = format!("{:?}", &message); let new_state = handle_message(Arc::clone(&context), message, peers, &event.token()); let peer = peers.get_mut_peer(&event.token()).unwrap(); - debug!("Got message from {}: {:?}", &peer.get_addr(), &m); + //debug!("Got message from {}: {:?}", &peer.get_addr(), &m); let stream = peer.get_stream(); match new_state { State::Message { data } => { @@ -247,7 +247,7 @@ fn handle_connection_event(context: Arc>, peers: &mut Peers, regi Some(peer) => { match peer.get_state().clone() { State::Connecting => { - debug!("Connected to peer {}, sending hello...", &peer.get_addr()); + //debug!("Connected to peer {}, sending hello...", &peer.get_addr()); let data: String = { let c = context.lock().unwrap(); let message = Message::hand(&c.app_version, &c.settings.origin, CHAIN_VERSION, c.settings.net.public, &my_id); @@ -257,7 +257,7 @@ fn handle_connection_event(context: Arc>, peers: &mut Peers, regi //debug!("Sent hello to {}", &peer.get_addr()); } State::Message { data } => { - debug!("Sending data to {}: {}", &peer.get_addr(), &String::from_utf8(data.clone()).unwrap()); + //debug!("Sending data to {}: {}", &peer.get_addr(), &String::from_utf8(data.clone()).unwrap()); send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending message {}", e)); } State::Connected => {} diff --git a/src/p2p/peers.rs b/src/p2p/peers.rs index 14dd197..59e488b 100644 --- a/src/p2p/peers.rs +++ b/src/p2p/peers.rs @@ -47,22 +47,22 @@ impl Peers { let _ = registry.deregister(stream); match peer.get_state() { State::Connecting => { - debug!("Peer connection {} to {:?} has timed out", &token.0, &peer.get_addr()); + trace!("Peer connection {} to {:?} has timed out", &token.0, &peer.get_addr()); } State::Connected => { - debug!("Peer connection {} to {:?} disconnected", &token.0, &peer.get_addr()); + trace!("Peer connection {} to {:?} disconnected", &token.0, &peer.get_addr()); } State::Idle { .. } | State::Message { .. } => { - debug!("Peer connection {} to {:?} disconnected", &token.0, &peer.get_addr()); + trace!("Peer connection {} to {:?} disconnected", &token.0, &peer.get_addr()); } State::Error => { - debug!("Peer connection {} to {:?} has shut down on error", &token.0, &peer.get_addr()); + trace!("Peer connection {} to {:?} has shut down on error", &token.0, &peer.get_addr()); } State::Banned => { - debug!("Peer connection {} to {:?} has shut down, banned", &token.0, &peer.get_addr()); + trace!("Peer connection {} to {:?} has shut down, banned", &token.0, &peer.get_addr()); } State::Offline { .. } => { - debug!("Peer connection {} to {:?} is offline", &token.0, &peer.get_addr()); + trace!("Peer connection {} to {:?} is offline", &token.0, &peer.get_addr()); } } @@ -84,7 +84,7 @@ impl Peers { peers.insert(peer.to_owned()); peers }); - debug!("Got {} peers: {:?}", peers.len(), &peers); + //debug!("Got {} peers: {:?}", peers.len(), &peers); // TODO make it return error if these peers are wrong and seem like an attack for peer in peers.iter() { let addr: SocketAddr = match peer.parse() { @@ -274,7 +274,7 @@ impl Peers { if peer.get_state().need_reconnect() { let addr = peer.get_addr(); if let Ok(mut stream) = TcpStream::connect(addr.clone()) { - debug!("Trying to connect to peer {}", &addr); + trace!("Trying to connect to peer {}", &addr); registry.register(&mut stream, token.clone(), Interest::WRITABLE).unwrap(); peer.set_state(State::Connecting); peer.inc_reconnects(); @@ -320,7 +320,7 @@ impl Peers { } if let Ok(mut stream) = TcpStream::connect(addr.clone()) { let token = next(unique_token); - debug!("Created connection {}, to peer {}", &token.0, &addr); + trace!("Created connection {}, to peer {}", &token.0, &addr); registry.register(&mut stream, token, Interest::WRITABLE).unwrap(); let mut peer = Peer::new(addr.clone(), stream, State::Connecting, false); peer.set_public(true);