Merge branch 'Nyaaori/prev_events-config-option' into 'next'

Make prev_events fetch limit configurable

See merge request famedly/conduit!422
This commit is contained in:
Timo Kösters 2022-12-21 11:06:42 +00:00
commit 94df9cdbba
3 changed files with 11 additions and 1 deletions

View File

@ -40,6 +40,8 @@ pub struct Config {
pub max_request_size: u32, pub max_request_size: u32,
#[serde(default = "default_max_concurrent_requests")] #[serde(default = "default_max_concurrent_requests")]
pub max_concurrent_requests: u16, pub max_concurrent_requests: u16,
#[serde(default = "default_max_fetch_prev_events")]
pub max_fetch_prev_events: u16,
#[serde(default = "false_fn")] #[serde(default = "false_fn")]
pub allow_registration: bool, pub allow_registration: bool,
#[serde(default = "true_fn")] #[serde(default = "true_fn")]
@ -249,6 +251,10 @@ fn default_max_concurrent_requests() -> u16 {
100 100
} }
fn default_max_fetch_prev_events() -> u16 {
100_u16
}
fn default_log() -> String { fn default_log() -> String {
"warn,state_res=warn,_=off,sled=off".to_owned() "warn,state_res=warn,_=off,sled=off".to_owned()
} }

View File

@ -222,6 +222,10 @@ impl Service {
self.config.max_request_size self.config.max_request_size
} }
pub fn max_fetch_prev_events(&self) -> u16 {
self.config.max_fetch_prev_events
}
pub fn allow_registration(&self) -> bool { pub fn allow_registration(&self) -> bool {
self.config.allow_registration self.config.allow_registration
} }

View File

@ -1226,7 +1226,7 @@ impl Service {
.await .await
.pop() .pop()
{ {
if amount > 100 { if amount > services().globals.max_fetch_prev_events() {
// Max limit reached // Max limit reached
warn!("Max prev event limit reached!"); warn!("Max prev event limit reached!");
graph.insert(prev_event_id.clone(), HashSet::new()); graph.insert(prev_event_id.clone(), HashSet::new());