Fix windows signals support (#325)

ntex-server/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [1.0.3] - 2024-03-29
+
+* Fix windows signals support
+
 ## [1.0.2] - 2024-03-25
 
 * Add basic signals support

ntex-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-server"
-version = "1.0.2"
+version = "1.0.3"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Server for ntex framework"
 keywords = ["network", "framework", "async", "futures"]

ntex-server/src/signals.rs

@@ -85,20 +85,49 @@ pub(crate) fn start<T: Send + 'static>(srv: Server<T>) {
 /// Signals are handled by oneshots, you have to re-register
 /// after each signal.
 pub(crate) fn start<T: Send + 'static>(srv: Server<T>) {
+    use std::sync::Mutex;
+
+    use ntex_rt::spawn;
+
+    static CUR_SYS: Mutex<RefCell<Option<System>>> = Mutex::new(RefCell::new(None));
+
+    let guard = match CUR_SYS.lock() {
+        Ok(guard) => guard,
+        Err(_) => {
+            log::error!("Cannot lock mutex");
+            return;
+        }
+    };
+
+    let mut sys = guard.borrow_mut();
+    let started = sys.is_some();
+    *sys = Some(System::current());
+
+    let rx = signal();
+    let _ = spawn(async move {
+        if let Ok(sig) = rx.await {
+            srv.signal(sig);
+        }
+    });
+
+    if !started {
         let _ = thread::Builder::new()
             .name("ntex-server signals".to_string())
             .spawn(move || {
                 ctrlc::set_handler(move || {
-                srv.signal(Signal::Int);
+                    if let Ok(guard) = CUR_SYS.lock() {
-
+                        if let Some(sys) = &*guard.borrow() {
-                System::current().arbiter().exec_fn(|| {
+                            sys.arbiter().exec_fn(|| {
                                 HANDLERS.with(|handlers| {
                                     for tx in handlers.borrow_mut().drain(..) {
                                         let _ = tx.send(Signal::Int);
                                     }
                                 })
                             });
+                        }
+                    }
                 })
                 .expect("Error setting Ctrl-C handler");
             });
+    }
 }