mirror of
https://gitlab.computer.surgery/matrix/grapevine.git
synced 2025-12-18 00:01:24 +01:00
move config check into config load function
This commit is contained in:
parent
75ef57e0ce
commit
e9caf228b3
3 changed files with 11 additions and 6 deletions
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue