Merge c3aaf9da6a into 92972ab6bf

docs/QUICK_START_GUIDE.en.md

@@ -72,9 +72,6 @@ classic = false
 secure = false
 tls = true
 
-[server]
-port = 443
-
 [server.api]
 enabled = true
 # listen = "127.0.0.1:9091"

docs/QUICK_START_GUIDE.ru.md

@@ -72,9 +72,6 @@ classic = false
 secure = false
 tls = true
 
-[server]
-port = 443
-
 [server.api]
 enabled = true
 # listen = "127.0.0.1:9091"

src/config/defaults.rs

@@ -147,10 +147,6 @@ pub(crate) fn default_proxy_protocol_header_timeout_ms() -> u64 {
     500
 }
 
-pub(crate) fn default_server_max_connections() -> u32 {
-    10_000
-}
-
 pub(crate) fn default_prefer_4() -> u8 {
     4
 }

src/config/types.rs

@@ -1185,11 +1185,6 @@ pub struct ServerConfig {
 
     #[serde(default)]
     pub listeners: Vec<ListenerConfig>,
-
-    /// Maximum number of concurrent client connections.
-    /// 0 means unlimited.
-    #[serde(default = "default_server_max_connections")]
-    pub max_connections: u32,
 }
 
 impl Default for ServerConfig {
@@ -1207,7 +1202,6 @@ impl Default for ServerConfig {
             metrics_whitelist: default_metrics_whitelist(),
             api: ApiConfig::default(),
             listeners: Vec::new(),
-            max_connections: default_server_max_connections(),
         }
     }
 }

src/maestro/mod.rs

@@ -349,13 +349,8 @@ pub async fn run() -> std::result::Result<(), Box<dyn std::error::Error>> {
     let beobachten = Arc::new(BeobachtenStore::new());
     let rng = Arc::new(SecureRandom::new());
 
-    // Connection concurrency limit (0 = unlimited)
+    // Connection concurrency limit
-    let max_connections_limit = if config.server.max_connections == 0 {
+    let max_connections = Arc::new(Semaphore::new(10_000));
-        Semaphore::MAX_PERMITS
-    } else {
-        config.server.max_connections as usize
-    };
-    let max_connections = Arc::new(Semaphore::new(max_connections_limit));
 
     let me2dc_fallback = config.general.me2dc_fallback;
     let me_init_retry_attempts = config.general.me_init_retry_attempts;