Skip to content

Commit 77dd938

Browse files
committed
feat!: [#878] make log_level config value mandatory
Althought, it has a default value `info` so you can omit it in the TOML config file.
1 parent ef9461a commit 77dd938

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

packages/configuration/src/v1/logging.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub struct Logging {
88
/// Logging level. Possible values are: `Off`, `Error`, `Warn`, `Info`,
99
/// `Debug` and `Trace`. Default is `Info`.
1010
#[serde(default = "Logging::default_log_level")]
11-
pub log_level: Option<LogLevel>,
11+
pub log_level: LogLevel,
1212
}
1313

1414
impl Default for Logging {
@@ -20,8 +20,7 @@ impl Default for Logging {
2020
}
2121

2222
impl Logging {
23-
#[allow(clippy::unnecessary_wraps)]
24-
fn default_log_level() -> Option<LogLevel> {
25-
Some(LogLevel::Info)
23+
fn default_log_level() -> LogLevel {
24+
LogLevel::Info
2625
}
2726
}

packages/test-helpers/src/configuration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub fn ephemeral() -> Configuration {
2929

3030
let mut config = Configuration::default();
3131

32-
config.logging.log_level = Some(LogLevel::Off); // Change to `debug` for tests debugging
32+
config.logging.log_level = LogLevel::Off; // Change to `debug` for tests debugging
3333

3434
// Ephemeral socket address for API
3535
let api_port = 0u16;

src/bootstrap/logging.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static INIT: Once = Once::new();
2020

2121
/// It redirects the log info to the standard output with the log level defined in the configuration
2222
pub fn setup(cfg: &Configuration) {
23-
let tracing_level = config_level_or_default(&cfg.logging.log_level);
23+
let tracing_level = map_to_tracing_level_filter(&cfg.logging.log_level);
2424

2525
if tracing_level == LevelFilter::OFF {
2626
return;
@@ -31,17 +31,14 @@ pub fn setup(cfg: &Configuration) {
3131
});
3232
}
3333

34-
fn config_level_or_default(log_level: &Option<LogLevel>) -> LevelFilter {
34+
fn map_to_tracing_level_filter(log_level: &LogLevel) -> LevelFilter {
3535
match log_level {
36-
None => LevelFilter::INFO,
37-
Some(level) => match level {
38-
LogLevel::Off => LevelFilter::OFF,
39-
LogLevel::Error => LevelFilter::ERROR,
40-
LogLevel::Warn => LevelFilter::WARN,
41-
LogLevel::Info => LevelFilter::INFO,
42-
LogLevel::Debug => LevelFilter::DEBUG,
43-
LogLevel::Trace => LevelFilter::TRACE,
44-
},
36+
LogLevel::Off => LevelFilter::OFF,
37+
LogLevel::Error => LevelFilter::ERROR,
38+
LogLevel::Warn => LevelFilter::WARN,
39+
LogLevel::Info => LevelFilter::INFO,
40+
LogLevel::Debug => LevelFilter::DEBUG,
41+
LogLevel::Trace => LevelFilter::TRACE,
4542
}
4643
}
4744

0 commit comments

Comments
 (0)