Просмотр исходного кода

net: cleanup log levels for blacklist/ ban behavior

darkfi 1 год назад
Родитель
Сommit
30e52c5021
2 измененных файлов с 8 добавлено и 3 удалено
  1. 7 2
      src/net/channel.rs
  2. 1 1
      src/net/hosts.rs

+ 7 - 2
src/net/channel.rs

@@ -28,7 +28,7 @@ use std::{
 use darkfi_serial::{
 use darkfi_serial::{
     async_trait, AsyncDecodable, AsyncEncodable, SerialDecodable, SerialEncodable, VarInt,
     async_trait, AsyncDecodable, AsyncEncodable, SerialDecodable, SerialEncodable, VarInt,
 };
 };
-use log::{debug, error, info, trace};
+use log::{debug, error, info, trace, warn};
 use rand::{rngs::OsRng, Rng};
 use rand::{rngs::OsRng, Rng};
 use smol::{
 use smol::{
     io::{self, AsyncRead, AsyncReadExt, AsyncWriteExt, ReadHalf, WriteHalf},
     io::{self, AsyncRead, AsyncReadExt, AsyncWriteExt, ReadHalf, WriteHalf},
@@ -383,7 +383,11 @@ impl Channel {
                 Ok(()) => {}
                 Ok(()) => {}
                 // If we're getting messages without dispatchers, it's spam.
                 // If we're getting messages without dispatchers, it's spam.
                 Err(Error::MissingDispatcher) => {
                 Err(Error::MissingDispatcher) => {
-                    debug!(target: "net::channel::main_receive_loop()", "Stopping channel {:?}", self);
+                    warn!(
+                    target: "net::channel::main_receive_loop()",
+                    "MissingDispatcher for command={}, channel={:?}",
+                    command, self
+                    );
                     if let BanPolicy::Strict = self.p2p().settings().read().await.ban_policy {
                     if let BanPolicy::Strict = self.p2p().settings().read().await.ban_policy {
                         self.ban(self.address()).await;
                         self.ban(self.address()).await;
                     }
                     }
@@ -431,6 +435,7 @@ impl Channel {
         };
         };
 
 
         let last_seen = UNIX_EPOCH.elapsed().unwrap().as_secs();
         let last_seen = UNIX_EPOCH.elapsed().unwrap().as_secs();
+        info!(target: "net::channel::ban()", "Blacklisting peer={}", peer);
         self.p2p().hosts().move_host(&peer, last_seen, HostColor::Black).unwrap();
         self.p2p().hosts().move_host(&peer, last_seen, HostColor::Black).unwrap();
         self.stop().await;
         self.stop().await;
         debug!(target: "net::channel::ban()", "STOP {:?}", self);
         debug!(target: "net::channel::ban()", "STOP {:?}", self);

+ 1 - 1
src/net/hosts.rs

@@ -1256,7 +1256,7 @@ impl Hosts {
             if self.container.contains(HostColor::Black as usize, addr_) ||
             if self.container.contains(HostColor::Black as usize, addr_) ||
                 self.block_all_ports(addr_)
                 self.block_all_ports(addr_)
             {
             {
-                warn!(
+                debug!(
                     target: "net::hosts::filter_addresses",
                     target: "net::hosts::filter_addresses",
                     "[{}] is blacklisted", addr_,
                     "[{}] is blacklisted", addr_,
                 );
                 );