Tokio needs descriptors for timers and more

pull/88/head
Frank Denis 2 years ago
parent ae5195cc7e
commit 936ff9f213

@ -523,7 +523,7 @@ fn set_limits(config: &Config) -> Result<(), Error> {
#[cfg(target_family = "unix")] #[cfg(target_family = "unix")]
fn set_limits(config: &Config) -> Result<(), Error> { fn set_limits(config: &Config) -> Result<(), Error> {
use rlimit::Resource; use rlimit::Resource;
let nb_descriptors = 2u32 let nb_descriptors = 4u32
.saturating_mul( .saturating_mul(
config config
.tcp_max_active_connections .tcp_max_active_connections
@ -531,10 +531,6 @@ fn set_limits(config: &Config) -> Result<(), Error> {
.saturating_add(config.listen_addrs.len() as u32), .saturating_add(config.listen_addrs.len() as u32),
) )
.saturating_add(16); .saturating_add(16);
if Resource::NOFILE
.set(nb_descriptors as _, nb_descriptors as _)
.is_err()
{
let (_soft, hard) = Resource::NOFILE.get()?; let (_soft, hard) = Resource::NOFILE.get()?;
if nb_descriptors as u64 > hard as u64 { if nb_descriptors as u64 > hard as u64 {
warn!( warn!(
@ -542,8 +538,8 @@ fn set_limits(config: &Config) -> Result<(), Error> {
nb_descriptors, hard nb_descriptors, hard
); );
} }
Resource::NOFILE.set(hard, hard)?; let nb_descriptors = std::cmp::max(nb_descriptors as _, hard);
} Resource::NOFILE.set(nb_descriptors, nb_descriptors)?;
Ok(()) Ok(())
} }

Loading…
Cancel
Save