WDG/noise-server
3
2
Fork 0
Code Issues 3 Pull Requests Projects 2 Releases 1 Wiki Activity

Fix database-path not being read from config

Browse Source 
`database-path` in config was correct, but was being overwritten by
`--database-path` option. In a test case the option was not given, but
clap/structopt marked it as `present`. The occurrences were `0` though.
This commit is contained in:
Elias Schriefer
2021-07-13 13:30:16 +00:00
parent aa021a9754
commit 450ec49bf0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.rs
View File

@@ -28,12 +28,11 @@ async fn main() -> Result<(), Box<dyn Error>> {
let mut config = Config::get(&options).await?; let mut config = Config::get(&options).await?;
if clap_matches.is_present("database-path") { if clap_matches.occurrences_of("database-path") > 0 {
config.database_path = options.database_path; config.database_path = options.database_path.clone();
} }
#[cfg(debug_assertions)] dbg!(&config);
println!("{:?}", config);
#[cfg(feature = "sqlite")] #[cfg(feature = "sqlite")]
let mut sqlite_connection = RwLock::new(sqlite::connect(&config.database_path).await?); let mut sqlite_connection = RwLock::new(sqlite::connect(&config.database_path).await?);