From 5619d7e3180661731800e253b558b88b407d2ae7 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Tue, 30 Apr 2024 20:50:24 -0700
Subject: [PATCH] remove program name from config option

This is technically a breaking change but this is really silly, I can't
not get rid of this.
---
 src/config/mod.rs   |  8 ++++----
 src/database/mod.rs | 10 +++++-----
 src/service/mod.rs  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/config/mod.rs b/src/config/mod.rs
index 4b532f2b..762504da 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -25,8 +25,8 @@ pub struct Config {
     pub database_path: String,
     #[serde(default = "default_db_cache_capacity_mb")]
     pub db_cache_capacity_mb: f64,
-    #[serde(default = "default_conduit_cache_capacity_modifier")]
-    pub conduit_cache_capacity_modifier: f64,
+    #[serde(default = "default_cache_capacity_modifier")]
+    pub cache_capacity_modifier: f64,
     #[serde(default = "default_rocksdb_max_open_files")]
     pub rocksdb_max_open_files: i32,
     #[serde(default = "default_pdu_cache_capacity")]
@@ -120,7 +120,7 @@ impl fmt::Display for Config {
             ),
             (
                 "Cache capacity modifier",
-                &self.conduit_cache_capacity_modifier.to_string(),
+                &self.cache_capacity_modifier.to_string(),
             ),
             #[cfg(feature = "rocksdb")]
             (
@@ -218,7 +218,7 @@ fn default_db_cache_capacity_mb() -> f64 {
     300.0
 }
 
-fn default_conduit_cache_capacity_modifier() -> f64 {
+fn default_cache_capacity_modifier() -> f64 {
     1.0
 }
 
diff --git a/src/database/mod.rs b/src/database/mod.rs
index 4a30465d..58ab4a51 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -346,19 +346,19 @@ impl KeyValueDatabase {
                     .expect("pdu cache capacity fits into usize"),
             )),
             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(
-                (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(
-                (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(
-                (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(
-                (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()),
             appservice_in_room_cache: RwLock::new(HashMap::new()),
diff --git a/src/service/mod.rs b/src/service/mod.rs
index c96a9041..045168eb 100644
--- a/src/service/mod.rs
+++ b/src/service/mod.rs
@@ -85,17 +85,17 @@ impl Services {
                 state_accessor: rooms::state_accessor::Service {
                     db,
                     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(
-                        (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_compressor: rooms::state_compressor::Service {
                     db,
                     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 {