liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

fix settings and tests

Browse Source
This commit is contained in:
John Smith
2022-03-10 11:10:11 -05:00
parent bb82811975
commit b6db4f7b8c
2 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
veilid-server/src/cmdline.rs
View File

@@ -1,10 +1,10 @@
use crate::settings::*;
use clap::{App, Arg, ArgMatches};
use clap::{Arg, ArgMatches, Command};
use std::ffi::OsStr;
use std::str::FromStr;
fn do_clap_matches(default_config_path: &OsStr) -> Result<clap::ArgMatches, clap::Error> {
let matches = App::new("veilid-server")
let matches = Command::new("veilid-server")
.version("0.1")
.about("Veilid Server")
.color(clap::ColorChoice::Auto)
@@ -111,10 +111,11 @@ pub fn process_command_line() -> Result<(Settings, ArgMatches), String> {
}
// Attempt to load configuration
let settings = Settings::new(
matches.occurrences_of("config-file") == 0,
matches.value_of_os("config-file").unwrap(),
)
let settings = Settings::new(if matches.occurrences_of("config-file") == 0 {
None
} else {
Some(matches.value_of_os("config-file").unwrap())
})
.map_err(|e| format!("configuration is invalid: {}", e))?;
// write lock the settings