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

parse configured EnvFilter once

Browse source 
This allows the error handling to be done upfront instead of for each
use. In particular, the `toml` error now points to the span of text in
the config file where the misconfigured EnvFilter value is. This is much
better than the previous error that did not indicate what was actually
causing it to happen.
This commit is contained in:
Charles Hall 2024-06-07 13:11:46 -07:00
parent 6b819d6f2d
commit c46eaed0e0
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
4 changed files with 54 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/config.rs
View file

@ -8,8 +8,10 @@ use serde::Deserialize;
use crate::error;
mod env_filter_clone;
mod proxy;
use env_filter_clone::EnvFilterClone;
use proxy::ProxyConfig;
#[allow(clippy::struct_excessive_bools)]
@ -69,7 +71,7 @@ pub(crate) struct Config {
#[serde(default = "default_trusted_servers")]
pub(crate) trusted_servers: Vec<OwnedServerName>,
#[serde(default = "default_log")]
pub(crate) log: String,
pub(crate) log: EnvFilterClone,
#[serde(default)]
pub(crate) turn_username: String,
#[serde(default)]
@ -146,8 +148,10 @@ fn default_trusted_servers() -> Vec<OwnedServerName> {
vec![OwnedServerName::try_from("matrix.org").unwrap()]
}
fn default_log() -> String {
"warn,state_res=warn,_=off".to_owned()
fn default_log() -> EnvFilterClone {
"warn,state_res=warn,_=off"
.parse()
.expect("hardcoded env filter should be valid")
}
fn default_turn_ttl() -> u64 {