backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-16 15:21:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

move config check into config load function

Browse source
This commit is contained in:
Charles Hall 2024-09-24 17:18:22 -07:00
parent 75ef57e0ce
commit e9caf228b3
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/config.rs
View file

@ -438,10 +438,16 @@ where
let path = path.as_ref();
toml::from_str(
let config: Config = toml::from_str(
&tokio::fs::read_to_string(path)
.await
.map_err(|e| Error::Read(e, path.to_owned()))?,
)
.map_err(|e| Error::Parse(e, path.to_owned()))
.map_err(|e| Error::Parse(e, path.to_owned()))?;
if config.registration_token.as_deref() == Some("") {
return Err(Error::RegistrationTokenEmpty);
}
Ok(config)
}

4
src/database.rs
View file

@ -353,10 +353,6 @@ impl KeyValueDatabase {
}
};
if config.registration_token == Some(String::new()) {
return Err(Error::bad_config("Registration token is empty"));
}
let db_raw = Box::new(Self {
db: builder.clone(),
userid_password: builder.open_tree("userid_password")?,

3
src/error.rs
View file

@ -95,6 +95,9 @@ pub(crate) enum Config {
#[error("failed to parse configuration file {1:?}")]
Parse(#[source] toml::de::Error, PathBuf),
#[error("registration token must not be empty")]
RegistrationTokenEmpty,
}
/// Errors that can occur while searching for a config file