itsi-server 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59f65a9b7f82d2e3e4e94eed7b1de48b9579e6a2ee40887f6de7500da9cb391
-  data.tar.gz: 7e49394fbbef18255d4a15ac6335b7acb74d925f2c026c5b24dcf9032f37bdc9
+  metadata.gz: ed95c9c3d6f98ecc1b489a6a250e6d2fd4e20c592e8a5eb70e88daae63d22dc2
+  data.tar.gz: 41ed850e9779845be4cbd2fbf47d0a42d8b08054c9581434431c54fd931c3fb8
 SHA512:
-  metadata.gz: 5886b25965a3fa73fb3ad3f6d7e915558f5cbf69a6dd62ab8dee23b51d64735b43d90942eadb05b44cb374cd64e00ad6eec078686511ca257f5b3f3b3fe99d48
-  data.tar.gz: b799d8fe05a30559d593f14b13c8b9c9a9f9569b610703e904177ca177671f171e5493615a48c39dd181fb9c2a67f75945e8c592d84ae15414ca4ebef3929ed4
+  metadata.gz: fcdb9213a107523d7bba3728341d072c8c09ee6a8d3d250489a98445236ec0330a14e737e6e7876c26d1836d782efbdd91cdaa828a6d4d7e7c89830a701e93d2
+  data.tar.gz: f2f3ad35ec63079df46f2b7387e6325b25191c9b0a42d695096b5c56c9d7fe73010bd3a76350a9f9e11e512b4abf650bc1d212addd25a3ac03485674ef7670b8

data/ext/itsi_scheduler/extconf.rb

@@ -3,4 +3,4 @@
 require "mkmf"
 require "rb_sys/mkmf"
 
-create_rust_makefile("scheduler/itsi_scheduler")
+create_rust_makefile("itsi/scheduler/itsi_scheduler")

data/ext/itsi_server/extconf.rb

@@ -3,4 +3,4 @@
 require "mkmf"
 require "rb_sys/mkmf"
 
-create_rust_makefile("server/itsi_server")
+create_rust_makefile("itsi/server/itsi_server")

data/ext/itsi_server/src/server/itsi_server.rs

@@ -2,7 +2,7 @@ use super::{
     bind::Bind,
     listener::Listener,
     serve_strategy::{cluster_mode::ClusterMode, single_mode::SingleMode},
-    signal::{reset_signal_handlers, SIGNAL_HANDLER_CHANNEL},
+    signal::{clear_signal_handlers, reset_signal_handlers, SIGNAL_HANDLER_CHANNEL},
 };
 use crate::{request::itsi_request::ItsiRequest, server::serve_strategy::ServeStrategy};
 use derive_more::Debug;
@@ -195,9 +195,11 @@ impl Server {
         Ok(Arc::new(listeners))
     }
 
-    pub(crate) fn build_strategy(self) -> Result<ServeStrategy> {
+    pub(crate) fn build_strategy(
+        self,
+        listeners: Arc<Vec<Arc<Listener>>>,
+    ) -> Result<ServeStrategy> {
         let server = Arc::new(self);
-        let listeners = server.listeners()?;
 
         let strategy = if server.config.workers == 1 {
             ServeStrategy::Single(Arc::new(SingleMode::new(
@@ -218,13 +220,25 @@ impl Server {
     pub fn start(&self) -> Result<()> {
         reset_signal_handlers();
         let rself = self.clone();
-        call_without_gvl(move || {
-            let strategy = rself.build_strategy()?;
+        let listeners = self.listeners()?;
+        let listeners_clone = listeners.clone();
+        call_without_gvl(move || -> Result<()> {
+            let strategy = rself.build_strategy(listeners_clone)?;
             if let Err(e) = strategy.run() {
                 error!("Error running server: {}", e);
                 strategy.stop()?;
             }
+            drop(strategy);
             Ok(())
-        })
+        })?;
+        if let Ok(listeners) = Arc::try_unwrap(listeners) {
+            listeners.into_iter().for_each(|listener| {
+                if let Ok(listener) = Arc::try_unwrap(listener) {
+                    listener.unbind()
+                };
+            });
+        }
+        clear_signal_handlers();
+        Ok(())
     }
 }

data/ext/itsi_server/src/server/lifecycle_event.rs

@@ -1,5 +1,6 @@
 #[derive(Debug, Clone)]
 pub enum LifecycleEvent {
+    Start,
     Shutdown,
     Restart,
     IncreaseWorkers,

data/ext/itsi_server/src/server/listener.rs

@@ -41,6 +41,14 @@ pub(crate) enum TokioListener {
 }
 
 impl TokioListener {
+    pub fn unbind(self) {
+        match self {
+            TokioListener::Tcp { listener, .. } => drop(listener.into_std().unwrap()),
+            TokioListener::TcpTls { listener, .. } => drop(listener.into_std().unwrap()),
+            TokioListener::Unix { listener } => drop(listener.into_std().unwrap()),
+            TokioListener::UnixTls { listener, .. } => drop(listener.into_std().unwrap()),
+        };
+    }
     pub(crate) async fn accept(&self) -> Result<IoStream> {
         match self {
             TokioListener::Tcp { listener, .. } => TokioListener::accept_tcp(listener).await,
@@ -166,6 +174,14 @@ impl std::fmt::Display for SockAddr {
 }
 
 impl Listener {
+    pub fn unbind(self) {
+        match self {
+            Listener::Tcp(listener) => drop(listener),
+            Listener::TcpTls((listener, _)) => drop(listener),
+            Listener::Unix(listener) => drop(listener),
+            Listener::UnixTls((listener, _)) => drop(listener),
+        };
+    }
     pub fn to_tokio_listener(&self) -> TokioListener {
         match self {
             Listener::Tcp(listener) => TokioListener::Tcp {

data/ext/itsi_server/src/server/serve_strategy/cluster_mode.rs

@@ -72,6 +72,7 @@ impl ClusterMode {
         lifecycle_event: LifecycleEvent,
     ) -> Result<()> {
         match lifecycle_event {
+            LifecycleEvent::Start => Ok(()),
             LifecycleEvent::Shutdown => {
                 self.shutdown().await?;
                 Ok(())

data/ext/itsi_server/src/server/serve_strategy/single_mode.rs

@@ -124,6 +124,9 @@ impl SingleMode {
                       }
                     }
                 }
+                if let Ok(listener) = Arc::try_unwrap(listener){
+                  listener.unbind();
+                }
             });
 
           }

data/ext/itsi_server/src/server/signal.rs

@@ -45,7 +45,8 @@ fn receive_signal(signum: i32, _: sighandler_t) {
     }
 }
 
-pub fn reset_signal_handlers() {
+pub fn reset_signal_handlers() -> bool {
+    SIGINT_COUNT.store(0, std::sync::atomic::Ordering::SeqCst);
     unsafe {
         libc::signal(libc::SIGTERM, receive_signal as usize);
         libc::signal(libc::SIGINT, receive_signal as usize);
@@ -54,4 +55,16 @@ pub fn reset_signal_handlers() {
         libc::signal(libc::SIGTTIN, receive_signal as usize);
         libc::signal(libc::SIGTTOU, receive_signal as usize);
     }
+    true
+}
+
+pub fn clear_signal_handlers() {
+    unsafe {
+        libc::signal(libc::SIGTERM, libc::SIG_DFL);
+        libc::signal(libc::SIGINT, libc::SIG_DFL);
+        libc::signal(libc::SIGUSR1, libc::SIG_DFL);
+        libc::signal(libc::SIGUSR2, libc::SIG_DFL);
+        libc::signal(libc::SIGTTIN, libc::SIG_DFL);
+        libc::signal(libc::SIGTTOU, libc::SIG_DFL);
+    }
 }

data/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/itsi/server.rb

@@ -9,6 +9,20 @@ require_relative "server/rack/handler/itsi"
 
 module Itsi
   class Server
+
+    def self.running?
+      @running ||= false
+    end
+
+    def self.start(app:, **opts)
+      server = new(app: ->{app}, **opts)
+      @running = true
+      Signal.trap('INT', 'DEFAULT')
+      server.start
+    ensure
+      @running = false
+    end
+
     def self.call(app, request)
       respond request, app.call(request.to_env)
     end

data/lib/itsi/signals.rb

@@ -1,18 +1,23 @@
 module Itsi
   module Signals
     DEFAULT_SIGNALS = ["DEFAULT", ""].freeze
-    module TrapInterceptor
-      def trap(signal, command = nil, &block)
-        return super unless DEFAULT_SIGNALS.include?(command.to_s) && block.nil?
-        Itsi::Server.reset_signal_handlers
+    module SignalTrap
+      def self.trap(signal, *args, &block)
+        if DEFAULT_SIGNALS.include?(command.to_s) && block.nil?
+          Itsi::Server.reset_signal_handlers
+          nil
+        else
+          super(signal, *args, &block)
+        end
       end
     end
-    [Kernel, Signal].each do |receiver|
-      receiver.singleton_class.prepend(TrapInterceptor)
-    end
-
-    [Object].each do |receiver|
-      receiver.include(TrapInterceptor)
-    end
   end
 end
+
+[Kernel, Signal].each do |receiver|
+  receiver.singleton_class.prepend(Itsi::Signals::SignalTrap)
+end
+
+[Object].each do |receiver|
+  receiver.include(Itsi::Signals::SignalTrap)
+end

metadata

@@ -1,28 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itsi-server
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Wouter Coppieters
 bindir: exe
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: libclang
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '14.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement