From 115ccb81b51d84374456e5554e2397f37ba866e9 Mon Sep 17 00:00:00 2001 From: BlackDex Date: Fri, 11 Oct 2024 18:53:33 +0200 Subject: [PATCH] Adjusted the code bsaed upon review Signed-off-by: BlackDex --- src/config.rs | 4 ++-- src/main.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.rs b/src/config.rs index a7183957..1a384701 100644 --- a/src/config.rs +++ b/src/config.rs @@ -20,7 +20,7 @@ static CONFIG_FILE: Lazy = Lazy::new(|| { get_env("CONFIG_FILE").unwrap_or_else(|| format!("{data_folder}/config.json")) }); -pub static SKIP_CONFIG_VALIDATION: Lazy = Lazy::new(|| AtomicBool::new(false)); +pub static SKIP_CONFIG_VALIDATION: AtomicBool = AtomicBool::new(false); pub static CONFIG: Lazy = Lazy::new(|| { Config::load().unwrap_or_else(|e| { @@ -1110,7 +1110,7 @@ impl Config { // Fill any missing with defaults let config = builder.build(); - if !SKIP_CONFIG_VALIDATION.load(Ordering::SeqCst) { + if !SKIP_CONFIG_VALIDATION.load(Ordering::Relaxed) { validate_config(&config)?; } diff --git a/src/main.rs b/src/main.rs index 608e0125..a0b40a84 100644 --- a/src/main.rs +++ b/src/main.rs @@ -124,7 +124,7 @@ fn parse_args() { print!("{HELP}"); exit(0); } else if pargs.contains(["-v", "--version"]) { - config::SKIP_CONFIG_VALIDATION.store(true, Ordering::SeqCst); + config::SKIP_CONFIG_VALIDATION.store(true, Ordering::Relaxed); let web_vault_version = util::get_web_vault_version(); println!("Vaultwarden {version}"); println!("Web-Vault {web_vault_version}");