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

remove program name from config option

Browse source 
This is technically a breaking change but this is really silly, I can't
not get rid of this.
This commit is contained in:
Charles Hall 2024-04-30 20:50:24 -07:00
parent d41f0fbf72
commit 5619d7e318
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/config/mod.rs
View file

@ -25,8 +25,8 @@ pub struct Config {
pub database_path: String, pub database_path: String,
#[serde(default = "default_db_cache_capacity_mb")] #[serde(default = "default_db_cache_capacity_mb")]
pub db_cache_capacity_mb: f64, pub db_cache_capacity_mb: f64,
#[serde(default = "default_conduit_cache_capacity_modifier")] #[serde(default = "default_cache_capacity_modifier")]
pub conduit_cache_capacity_modifier: f64, pub cache_capacity_modifier: f64,
#[serde(default = "default_rocksdb_max_open_files")] #[serde(default = "default_rocksdb_max_open_files")]
pub rocksdb_max_open_files: i32, pub rocksdb_max_open_files: i32,
#[serde(default = "default_pdu_cache_capacity")] #[serde(default = "default_pdu_cache_capacity")]
@ -120,7 +120,7 @@ impl fmt::Display for Config {
), ),
( (
"Cache capacity modifier", "Cache capacity modifier",
&self.conduit_cache_capacity_modifier.to_string(), &self.cache_capacity_modifier.to_string(),
), ),
#[cfg(feature = "rocksdb")] #[cfg(feature = "rocksdb")]
( (
@ -218,7 +218,7 @@ fn default_db_cache_capacity_mb() -> f64 {
300.0 300.0
} }
fn default_conduit_cache_capacity_modifier() -> f64 { fn default_cache_capacity_modifier() -> f64 {
1.0 1.0
} }

10
src/database/mod.rs
View file

@ -346,19 +346,19 @@ impl KeyValueDatabase {
.expect("pdu cache capacity fits into usize"), .expect("pdu cache capacity fits into usize"),
)), )),
auth_chain_cache: Mutex::new(LruCache::new( auth_chain_cache: Mutex::new(LruCache::new(
(100_000.0 * config.conduit_cache_capacity_modifier) as usize, (100_000.0 * config.cache_capacity_modifier) as usize,
)), )),
shorteventid_cache: Mutex::new(LruCache::new( shorteventid_cache: Mutex::new(LruCache::new(
(100_000.0 * config.conduit_cache_capacity_modifier) as usize, (100_000.0 * config.cache_capacity_modifier) as usize,
)), )),
eventidshort_cache: Mutex::new(LruCache::new( eventidshort_cache: Mutex::new(LruCache::new(
(100_000.0 * config.conduit_cache_capacity_modifier) as usize, (100_000.0 * config.cache_capacity_modifier) as usize,
)), )),
shortstatekey_cache: Mutex::new(LruCache::new( shortstatekey_cache: Mutex::new(LruCache::new(
(100_000.0 * config.conduit_cache_capacity_modifier) as usize, (100_000.0 * config.cache_capacity_modifier) as usize,
)), )),
statekeyshort_cache: Mutex::new(LruCache::new( statekeyshort_cache: Mutex::new(LruCache::new(
(100_000.0 * config.conduit_cache_capacity_modifier) as usize, (100_000.0 * config.cache_capacity_modifier) as usize,
)), )),
our_real_users_cache: RwLock::new(HashMap::new()), our_real_users_cache: RwLock::new(HashMap::new()),
appservice_in_room_cache: RwLock::new(HashMap::new()), appservice_in_room_cache: RwLock::new(HashMap::new()),

6
src/service/mod.rs
View file

@ -85,17 +85,17 @@ impl Services {
state_accessor: rooms::state_accessor::Service { state_accessor: rooms::state_accessor::Service {
db, db,
server_visibility_cache: StdMutex::new(LruCache::new( server_visibility_cache: StdMutex::new(LruCache::new(
(100.0 * config.conduit_cache_capacity_modifier) as usize, (100.0 * config.cache_capacity_modifier) as usize,
)), )),
user_visibility_cache: StdMutex::new(LruCache::new( user_visibility_cache: StdMutex::new(LruCache::new(
(100.0 * config.conduit_cache_capacity_modifier) as usize, (100.0 * config.cache_capacity_modifier) as usize,
)), )),
}, },
state_cache: rooms::state_cache::Service { db }, state_cache: rooms::state_cache::Service { db },
state_compressor: rooms::state_compressor::Service { state_compressor: rooms::state_compressor::Service {
db, db,
stateinfo_cache: StdMutex::new(LruCache::new( stateinfo_cache: StdMutex::new(LruCache::new(
(100.0 * config.conduit_cache_capacity_modifier) as usize, (100.0 * config.cache_capacity_modifier) as usize,
)), )),
}, },
timeline: rooms::timeline::Service { timeline: rooms::timeline::Service {