Implement log_level config option

This commit is contained in:
Daniel García 2019-03-25 14:12:41 +01:00
parent c384f9c0ca
commit 2475c36a75
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
3 changed files with 10 additions and 1 deletions

View file

@ -43,6 +43,12 @@
## It's recommended to also set 'ROCKET_CLI_COLORS=off' ## It's recommended to also set 'ROCKET_CLI_COLORS=off'
# LOG_FILE=/path/to/log # LOG_FILE=/path/to/log
## Log level
## Change the verbosity of the log output
## Valid values are "trace", "debug", "info", "warn", "error" and "off"
## This requires extended logging
# LOG_LEVEL=Info
## Enable WAL for the DB ## Enable WAL for the DB
## Set to false to avoid enabling WAL during startup. ## Set to false to avoid enabling WAL during startup.
## Note that if the DB already has WAL enabled, you will also need to disable WAL in the DB, ## Note that if the DB already has WAL enabled, you will also need to disable WAL in the DB,

View file

@ -277,6 +277,8 @@ make_config! {
extended_logging: bool, false, def, true; extended_logging: bool, false, def, true;
/// Log file path /// Log file path
log_file: String, false, option; log_file: String, false, option;
/// Log level
log_level: String, false, def, "Info".to_string();
/// Enable DB WAL |> Turning this off might lead to worse performance, but might help if using bitwarden_rs on some exotic filesystems, /// Enable DB WAL |> Turning this off might lead to worse performance, but might help if using bitwarden_rs on some exotic filesystems,
/// that do not support WAL. Please make sure you read project wiki on the topic before changing this setting. /// that do not support WAL. Please make sure you read project wiki on the topic before changing this setting.

View file

@ -69,6 +69,7 @@ fn launch_info() {
} }
fn init_logging() -> Result<(), fern::InitError> { fn init_logging() -> Result<(), fern::InitError> {
use std::str::FromStr;
let mut logger = fern::Dispatch::new() let mut logger = fern::Dispatch::new()
.format(|out, message, record| { .format(|out, message, record| {
out.finish(format_args!( out.finish(format_args!(
@ -79,7 +80,7 @@ fn init_logging() -> Result<(), fern::InitError> {
message message
)) ))
}) })
.level(log::LevelFilter::Info) .level(log::LevelFilter::from_str(&CONFIG.log_level()).expect("Valid log level"))
// Hide unknown certificate errors if using self-signed // Hide unknown certificate errors if using self-signed
.level_for("rustls::session", log::LevelFilter::Off) .level_for("rustls::session", log::LevelFilter::Off)
// Hide failed to close stream messages // Hide failed to close stream messages