Sweetbread/Alfis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed some logging.

Browse Source
This commit is contained in:
Revertron
2021-04-13 23:19:47 +02:00
parent 27352ba0d8
commit aef30818be
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blockchain/filter.rs
+3 -3
View File
@@ -36,14 +36,14 @@ impl DnsFilter for BlockchainFilter {
subdomain = String::from(parts[2]); 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 data = self.context.lock().unwrap().chain.get_domain_info(&search);
let zone = parts[0].to_owned(); let zone = parts[0].to_owned();
match data { match data {
None => { None => {
debug!("Not found data for domain {}", &search);
if self.context.lock().unwrap().chain.is_zone_in_blockchain(&zone) { if self.context.lock().unwrap().chain.is_zone_in_blockchain(&zone) {
trace!("Not found data for domain {}", &search);
// Create DnsPacket // Create DnsPacket
let mut packet = DnsPacket::new(); let mut packet = DnsPacket::new();
packet.questions.push(DnsQuestion::new(String::from(qname), qtype)); packet.questions.push(DnsQuestion::new(String::from(qname), qtype));
@@ -55,7 +55,7 @@ impl DnsFilter for BlockchainFilter {
} }
} }
Some(data) => { Some(data) => {
debug!("Found data for domain {}", &search); trace!("Found data for domain {}", &search);
let mut data: DomainData = match serde_json::from_str(&data) { let mut data: DomainData = match serde_json::from_str(&data) {
Err(_) => { return None; } Err(_) => { return None; }
Ok(data) => { data } Ok(data) => { data }
src/p2p/network.rs
+7 -7
View File
@@ -72,11 +72,11 @@ impl Network {
// Process each event. // Process each event.
for event in events.iter() { 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. // We can use the token we previously provided to `register` to determine for which socket the event is.
match event.token() { match event.token() {
SERVER => { 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. // If this is an event for the server, it means a connection is ready to be accepted.
let connection = server.accept(); let connection = server.accept();
match connection { match connection {
@@ -104,7 +104,7 @@ impl Network {
stream.shutdown(Shutdown::Both).unwrap_or_else(|e|{ warn!("Error in shutdown, {}", e); }); stream.shutdown(Shutdown::Both).unwrap_or_else(|e|{ warn!("Error in shutdown, {}", e); });
warn!("Detected connection loop, ignoring IP: {}", &address.ip()); warn!("Detected connection loop, ignoring IP: {}", &address.ip());
} else { } 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); let token = next(&mut unique_token);
poll.registry().register(&mut stream, token, Interest::READABLE).expect("Error registering poll"); poll.registry().register(&mut stream, token, Interest::READABLE).expect("Error registering poll");
peers.add_peer(token, Peer::new(address, stream, State::Connected, true)); peers.add_peer(token, Peer::new(address, stream, State::Connected, true));
@@ -208,10 +208,10 @@ fn handle_connection_event(context: Arc<Mutex<Context>>, peers: &mut Peers, regi
let data = data.unwrap(); let data = data.unwrap();
match Message::from_bytes(data) { match Message::from_bytes(data) {
Ok(message) => { Ok(message) => {
let m = format!("{:?}", &message); //let m = format!("{:?}", &message);
let new_state = handle_message(Arc::clone(&context), message, peers, &event.token()); let new_state = handle_message(Arc::clone(&context), message, peers, &event.token());
let peer = peers.get_mut_peer(&event.token()).unwrap(); 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(); let stream = peer.get_stream();
match new_state { match new_state {
State::Message { data } => { State::Message { data } => {
@@ -247,7 +247,7 @@ fn handle_connection_event(context: Arc<Mutex<Context>>, peers: &mut Peers, regi
Some(peer) => { Some(peer) => {
match peer.get_state().clone() { match peer.get_state().clone() {
State::Connecting => { State::Connecting => {
debug!("Connected to peer {}, sending hello...", &peer.get_addr()); //debug!("Connected to peer {}, sending hello...", &peer.get_addr());
let data: String = { let data: String = {
let c = context.lock().unwrap(); let c = context.lock().unwrap();
let message = Message::hand(&c.app_version, &c.settings.origin, CHAIN_VERSION, c.settings.net.public, &my_id); 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<Mutex<Context>>, peers: &mut Peers, regi
//debug!("Sent hello to {}", &peer.get_addr()); //debug!("Sent hello to {}", &peer.get_addr());
} }
State::Message { data } => { 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)); send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending message {}", e));
} }
State::Connected => {} State::Connected => {}
src/p2p/peers.rs
+9 -9
View File
@@ -47,22 +47,22 @@ impl Peers {
let _ = registry.deregister(stream); let _ = registry.deregister(stream);
match peer.get_state() { match peer.get_state() {
State::Connecting => { 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 => { 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 { .. } => { 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 => { 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 => { 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 { .. } => { 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.insert(peer.to_owned());
peers 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 // TODO make it return error if these peers are wrong and seem like an attack
for peer in peers.iter() { for peer in peers.iter() {
let addr: SocketAddr = match peer.parse() { let addr: SocketAddr = match peer.parse() {
@@ -274,7 +274,7 @@ impl Peers {
if peer.get_state().need_reconnect() { if peer.get_state().need_reconnect() {
let addr = peer.get_addr(); let addr = peer.get_addr();
if let Ok(mut stream) = TcpStream::connect(addr.clone()) { 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(); registry.register(&mut stream, token.clone(), Interest::WRITABLE).unwrap();
peer.set_state(State::Connecting); peer.set_state(State::Connecting);
peer.inc_reconnects(); peer.inc_reconnects();
@@ -320,7 +320,7 @@ impl Peers {
} }
if let Ok(mut stream) = TcpStream::connect(addr.clone()) { if let Ok(mut stream) = TcpStream::connect(addr.clone()) {
let token = next(unique_token); 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(); registry.register(&mut stream, token, Interest::WRITABLE).unwrap();
let mut peer = Peer::new(addr.clone(), stream, State::Connecting, false); let mut peer = Peer::new(addr.clone(), stream, State::Connecting, false);
peer.set_public(true); peer.set_public(true);