Browse Source

Adjusted the code bsaed upon review

Signed-off-by: BlackDex <black.dex@gmail.com>
pull/5055/head
BlackDex 6 months ago
parent
commit
115ccb81b5
No known key found for this signature in database GPG Key ID: 58C80A2AA6C765E1
  1. 4
      src/config.rs
  2. 2
      src/main.rs

4
src/config.rs

@ -20,7 +20,7 @@ static CONFIG_FILE: Lazy<String> = Lazy::new(|| {
get_env("CONFIG_FILE").unwrap_or_else(|| format!("{data_folder}/config.json"))
});
pub static SKIP_CONFIG_VALIDATION: Lazy<AtomicBool> = Lazy::new(|| AtomicBool::new(false));
pub static SKIP_CONFIG_VALIDATION: AtomicBool = AtomicBool::new(false);
pub static CONFIG: Lazy<Config> = 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)?;
}

2
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}");

Loading…
Cancel
Save