d46b0b6 radicle: Fix file limit setting for FreeBSD — heartwood

Radicle Heartwood Protocol & Stack

radicle: Fix file limit setting for FreeBSD

Fintan Halpenny committed 1 year ago

commit d46b0b6d113ec86c8d1443c1d354ac7ce216f684
parent 860f1dc8674bae9d92fe7311e204fe02e7bd0d88

3 files changed +20 -2

modified radicle-httpd/src/commands/web.rs

@@ -192,6 +192,8 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {

     }
     if options.open {
         #[cfg(any(target_os = "freebsd", target_os = "windows"))]
         let cmd_name = "echo";
         #[cfg(target_os = "macos")]
         let cmd_name = "open";
         #[cfg(target_os = "linux")]

modified radicle-node/src/main.rs

@@ -120,7 +120,7 @@ fn execute() -> anyhow::Result<()> {

         config.node.listen.clone()
     };
     if let Err(e) = radicle::io::set_file_limit(config.node.limits.max_open_files as u64) {
     if let Err(e) = radicle::io::set_file_limit(config.node.limits.max_open_files) {
         log::warn!(target: "node", "Unable to set process open file limit: {e}");
     }

modified radicle/src/io.rs

@@ -1,9 +1,25 @@

 use std::fmt;
 use std::io;
 use libc::{getrlimit, rlimit, setrlimit, RLIMIT_NOFILE};
 #[cfg(not(target_os = "freebsd"))]
 type Int = u64;
 #[cfg(target_os = "freebsd")]
 type Int = i64;
 /// Sets the open file limit to the given value, or the maximum allowed value.
 pub fn set_file_limit(n: u64) -> io::Result<u64> {
 pub fn set_file_limit<N>(n: N) -> io::Result<Int>
 where
     N: Copy + fmt::Display,
     Int: TryFrom<N>,
 {
     let Ok(n) = Int::try_from(n) else {
         return Err(io::Error::new(
             io::ErrorKind::InvalidInput,
             format!("invalid file limit '{n}'"),
         ));
     };
     let mut rlim = rlimit {
         rlim_cur: 0, // Initial soft limit value
         rlim_max: 0, // Initial hard limit value