Adjust logging levels of some external crates

1 files changed, 17 insertions, 0 deletions

diff --git a/mullvad-daemon/src/logging.rs b/mullvad-daemon/src/logging.rs
index 442c93a3a8..24b60bb5e9 100644
--- a/mullvad-daemon/src/logging.rs
+++ b/mullvad-daemon/src/logging.rs
@@ -35,12 +35,14 @@ const SILENCED_CRATES: &[&str] = &[
     "tokio_io",
     "tokio_proto",
     "tokio_reactor",
+    "tokio_threadpool",
     "jsonrpc_ws_server",
     "want",
     "ws",
     "mio",
     "hyper",
 ];
+const SLIGHTLY_SILENCED_CRATES: &[&str] = &["mnl", "nftnl"];
 
 const COLORS: ColoredLevelConfig = ColoredLevelConfig {
     error: Color::Red,
@@ -67,6 +69,9 @@ pub fn init_logger(
     for silenced_crate in SILENCED_CRATES {
         top_dispatcher = top_dispatcher.level_for(*silenced_crate, log::LevelFilter::Warn);
     }
+    for silenced_crate in SLIGHTLY_SILENCED_CRATES {
+        top_dispatcher = top_dispatcher.level_for(*silenced_crate, one_level_quieter(log_level));
+    }
 
     let stdout_formatter = Formatter {
         output_timestamp: output_timestamp,
@@ -94,6 +99,18 @@ pub fn init_logger(
     Ok(())
 }
 
+fn one_level_quieter(level: log::LevelFilter) -> log::LevelFilter {
+    use log::LevelFilter::*;
+    match level {
+        Off => Off,
+        Error => Off,
+        Warn => Error,
+        Info => Warn,
+        Debug => Info,
+        Trace => Debug,
+    }
+}
+
 #[derive(Default, Debug)]
 struct Formatter {
     pub output_timestamp: bool,