Merge branch 'improve-startup-logging'

2 files changed, 4 insertions, 1 deletions

diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs
index 2693c37a15..95e466c65e 100644
--- a/mullvad-daemon/src/cli.rs
+++ b/mullvad-daemon/src/cli.rs
@@ -3,6 +3,7 @@ use log;
 
 use crate::version;
 
+#[derive(Debug)]
 pub struct Config {
     pub log_level: log::LevelFilter,
     pub log_to_file: bool,
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 53d38f8902..6ea88dd836 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -1,6 +1,6 @@
 #![deny(rust_2018_idioms)]
 
-use log::{debug, error, info, warn};
+use log::{debug, error, info, trace, warn};
 use mullvad_daemon::{
     logging,
     management_interface::{ManagementInterfaceEventBroadcaster, ManagementInterfaceServer},
@@ -26,6 +26,8 @@ fn main() {
         std::process::exit(1)
     });
 
+    trace!("Using configuration: {:?}", config);
+
     let runtime = new_runtime_builder().build().unwrap_or_else(|error| {
         eprintln!("{}", error.display_chain());
         std::process::exit(1);