feat!: [torrust#878] make log_level config value mandatory

Althought, it has a default value `info` so you can omit it in the TOML config file.
da2ce7 · Jun 20, 2024 · 37a09aa · 37a09aa
1 parent 73dec71
commit 37a09aa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/packages/configuration/src/v1/logging.rs b/packages/configuration/src/v1/logging.rs
@@ -8,7 +8,7 @@ pub struct Logging {
     /// Logging level. Possible values are: `Off`, `Error`, `Warn`, `Info`,
     /// `Debug` and `Trace`. Default is `Info`.
     #[serde(default = "Logging::default_log_level")]
-    pub log_level: Option<LogLevel>,
+    pub log_level: LogLevel,
 }
 
 impl Default for Logging {
@@ -20,8 +20,7 @@ impl Default for Logging {
 }
 
 impl Logging {
-    #[allow(clippy::unnecessary_wraps)]
-    fn default_log_level() -> Option<LogLevel> {
-        Some(LogLevel::Info)
+    fn default_log_level() -> LogLevel {
+        LogLevel::Info
     }
 }
diff --git a/packages/test-helpers/src/configuration.rs b/packages/test-helpers/src/configuration.rs
@@ -29,7 +29,7 @@ pub fn ephemeral() -> Configuration {
 
     let mut config = Configuration::default();
 
-    config.logging.log_level = Some(LogLevel::Off); // Change to `debug` for tests debugging
+    config.logging.log_level = LogLevel::Off; // Change to `debug` for tests debugging
 
     // Ephemeral socket address for API
     let api_port = 0u16;

diff --git a/src/bootstrap/app.rs b/src/bootstrap/app.rs
@@ -42,10 +42,7 @@ fn map_to_tracing_level_filter(log_level: &LogLevel) -> LevelFilter {
 pub fn config() -> (Configuration, LevelFilter) {
     let config = initialize_configuration();
 
-    let level: LevelFilter = match &config.logging.log_level {
-        None => LevelFilter::INFO,
-        Some(level) => map_to_tracing_level_filter(level),
-    };
+    let level: LevelFilter = map_to_tracing_level_filter(&config.logging.log_level);
 
     (config, level)
 }