Add signals support (#316)

ntex-rt/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.4.12] - 2024-03-25
+
+* Relax Arbiter::exec() generic param
+
 ## [0.4.11] - 2023-11-22
 
 * Replace async-oneshot with oneshot

ntex-rt/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-rt"
-version = "0.4.11"
+version = "0.4.12"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "ntex runtime"
 keywords = ["network", "framework", "async", "futures"]

ntex-rt/src/arbiter.rs

@@ -150,7 +150,7 @@ impl Arbiter {
     pub fn exec<F, R>(&self, f: F) -> impl Future<Output = Result<R, oneshot::RecvError>>
     where
         F: FnOnce() -> R + Send + 'static,
-        R: Sync + Send + 'static,
+        R: Send + 'static,
     {
         let (tx, rx) = oneshot::channel();
         let _ = self

ntex-server/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [1.0.2] - 2024-03-25
+
+* Add basic signals support
+
 ## [1.0.1] - 2024-03-24
 
 * Re-add Server::build() method

ntex-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-server"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Server for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -19,7 +19,7 @@ path = "src/lib.rs"
 ntex-bytes = "0.1.24"
 ntex-net = "1.0"
 ntex-service = "2.0"
-ntex-rt = "0.4"
+ntex-rt = "0.4.12"
 ntex-util = "1.0"
 
 async-channel = "2.2"

ntex-server/src/lib.rs

@@ -15,6 +15,9 @@ pub use self::pool::WorkerPool;
 pub use self::server::Server;
 pub use self::wrk::{Worker, WorkerStatus, WorkerStop};
 
+#[doc(hidden)]
+pub use self::signals::{signal, Signal};
+
 /// Worker id
 #[derive(Default, Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct WorkerId(usize);

ntex-server/src/signals.rs

@@ -1,10 +1,16 @@
-use std::thread;
+use std::{cell::RefCell, thread};
+
+use ntex_rt::System;
 
 use crate::server::Server;
 
+thread_local! {
+    static HANDLERS: RefCell<Vec<oneshot::Sender<Signal>>> = Default::default();
+}
+
 /// Different types of process signals
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
-pub(crate) enum Signal {
+pub enum Signal {
     /// SIGHUP
     Hup,
     /// SIGINT
@@ -15,6 +21,19 @@ pub(crate) enum Signal {
     Quit,
 }
 
+#[doc(hidden)]
+/// Register signal handler.
+pub fn signal() -> oneshot::Receiver<Signal> {
+    let (tx, rx) = oneshot::channel();
+    System::current().arbiter().exec_fn(|| {
+        HANDLERS.with(|handlers| {
+            handlers.borrow_mut().push(tx);
+        })
+    });
+
+    rx
+}
+
 #[cfg(target_family = "unix")]
 /// Register signal handler.
 ///
@@ -36,18 +55,25 @@ pub(crate) fn start<T: Send + 'static>(srv: Server<T>) {
                 }
             };
             for info in &mut signals {
-                match info {
+                let sig = match info {
-                    SIGHUP => srv.signal(Signal::Hup),
+                    SIGHUP => Signal::Hup,
-                    SIGTERM => srv.signal(Signal::Term),
+                    SIGTERM => Signal::Term,
-                    SIGINT => {
+                    SIGINT => Signal::Int,
-                        srv.signal(Signal::Int);
+                    SIGQUIT => Signal::Quit,
-                        return;
+                    _ => continue,
-                    }
+                };
-                    SIGQUIT => {
+
-                        srv.signal(Signal::Quit);
+                srv.signal(sig);
-                        return;
+                System::current().arbiter().exec_fn(move || {
-                    }
+                    HANDLERS.with(|handlers| {
-                    _ => {}
+                        for tx in handlers.borrow_mut().drain(..) {
+                            let _ = tx.send(sig);
+                        }
+                    })
+                });
+
+                if matches!(sig, Signal::Int | Signal::Quit) {
+                    return;
                 }
             }
         });
@@ -64,6 +90,14 @@ pub(crate) fn start<T: Send + 'static>(srv: Server<T>) {
         .spawn(move || {
             ctrlc::set_handler(move || {
                 srv.signal(Signal::Int);
+
+                System::current().arbiter().exec_fn(|| {
+                    HANDLERS.with(|handlers| {
+                        for tx in handlers.borrow_mut().drain(..) {
+                            let _ = tx.send(Signal::Int);
+                        }
+                    })
+                });
             })
             .expect("Error setting Ctrl-C handler");
         });