diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-07-22 15:33:38 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-08-09 09:43:58 +0200 |
| commit | 4b8330b3d3557882c6a877f0cd3490ed8be08869 (patch) | |
| tree | 0915214092ffdc70c234fd75e08a2f10d84d33aa | |
| parent | b44cfab6800e7f5acdb852a0397bfe845e8df9a0 (diff) | |
| download | mullvadvpn-4b8330b3d3557882c6a877f0cd3490ed8be08869.tar.xz mullvadvpn-4b8330b3d3557882c6a877f0cd3490ed8be08869.zip | |
Make logs less spammy
Co-authored-by: Markus Pettersson <markus.pettersson@mullvad.net>
| -rw-r--r-- | test/test-manager/src/logging.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/mullvad_daemon.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/network_monitor.rs | 6 | ||||
| -rw-r--r-- | test/test-manager/src/vm/network/linux.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/vm/provision.rs | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/test/test-manager/src/logging.rs b/test/test-manager/src/logging.rs index 3d1aa13156..2bc5ea90d1 100644 --- a/test/test-manager/src/logging.rs +++ b/test/test-manager/src/logging.rs @@ -30,6 +30,8 @@ impl Logger { logger.filter_module("tower", log::LevelFilter::Info); logger.filter_module("hyper", log::LevelFilter::Info); logger.filter_module("rustls", log::LevelFilter::Info); + logger.filter_module("tarpc", log::LevelFilter::Warn); + logger.filter_module("mio_serial", log::LevelFilter::Warn); logger.filter_level(log::LevelFilter::Info); logger.parse_env(env_logger::DEFAULT_FILTER_ENV); diff --git a/test/test-manager/src/mullvad_daemon.rs b/test/test-manager/src/mullvad_daemon.rs index 115a09e049..251ed3d1fe 100644 --- a/test/test-manager/src/mullvad_daemon.rs +++ b/test/test-manager/src/mullvad_daemon.rs @@ -69,7 +69,7 @@ impl RpcClientProvider { // FIXME: Ugly workaround to ensure that we don't receive stuff from a // previous RPC session. tokio::time::sleep(std::time::Duration::from_millis(500)).await; - log::debug!("Mullvad daemon: connecting"); + log::trace!("Mullvad daemon: connecting"); let channel = tonic::transport::Endpoint::from_static("serial://placeholder") .timeout(GRPC_REQUEST_TIMEOUT) .connect_with_connector(self.service.clone()) diff --git a/test/test-manager/src/network_monitor.rs b/test/test-manager/src/network_monitor.rs index ddd35edc7e..1a5ef5e463 100644 --- a/test/test-manager/src/network_monitor.rs +++ b/test/test-manager/src/network_monitor.rs @@ -59,7 +59,7 @@ impl PacketCodec for Codec { EtherTypes::Ipv4 => Self::parse_ipv4(frame.payload()), EtherTypes::Ipv6 => Self::parse_ipv6(frame.payload()), ethertype => { - log::debug!("Ignoring unknown ethertype: {ethertype}"); + log::trace!("Ignoring unknown ethertype: {ethertype}"); None } } @@ -288,11 +288,11 @@ async fn start_packet_monitor_for_interface( Some(Ok(packet))=> { if let Some(packet) = packet { if !filter_fn(&packet) { - log::debug!("{interface} \"{packet:?}\" does not match closure conditions"); + log::trace!("{interface} \"{packet:?}\" does not match closure conditions"); monitor_result.discarded_packets = monitor_result.discarded_packets.saturating_add(1); } else { - log::debug!("{interface} \"{packet:?}\" matches closure conditions"); + log::trace!("{interface} \"{packet:?}\" matches closure conditions"); let should_continue = should_continue_fn(&packet); diff --git a/test/test-manager/src/vm/network/linux.rs b/test/test-manager/src/vm/network/linux.rs index 1a4e994a52..12095138f6 100644 --- a/test/test-manager/src/vm/network/linux.rs +++ b/test/test-manager/src/vm/network/linux.rs @@ -106,7 +106,7 @@ pub async fn setup_test_network() -> Result<NetworkHandle> { let test_subnet = TEST_SUBNET.to_string(); - log::info!("Create bridge network: dev {BRIDGE_NAME}, net {test_subnet}"); + log::debug!("Create bridge network: dev {BRIDGE_NAME}, net {test_subnet}"); run_ip_cmd(["link", "add", BRIDGE_NAME, "type", "bridge"]).await?; run_ip_cmd(["addr", "add", "dev", BRIDGE_NAME, &test_subnet]).await?; diff --git a/test/test-manager/src/vm/provision.rs b/test/test-manager/src/vm/provision.rs index 42a12eb426..9a0153abd1 100644 --- a/test/test-manager/src/vm/provision.rs +++ b/test/test-manager/src/vm/provision.rs @@ -18,7 +18,7 @@ pub async fn provision( ) -> Result<String> { match config.provisioner { Provisioner::Ssh => { - log::info!("SSH provisioning"); + log::debug!("SSH provisioning"); let (user, password) = config.get_ssh_options().context("missing SSH config")?; ssh( |
