itsi-server 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb929709a8dccdf23ec4cdbf7c5880277b9d12f23a1f2d962ed06dcb51c9223
-  data.tar.gz: 137a2e85d1e3d57cdfc007c004b3b385c2db2e90f9b1d613c5d4e0bb0bad129f
+  metadata.gz: d77f7c74603a2d05018b9317c3855346c4ff44cf442d0978dba6ccc36c833846
+  data.tar.gz: 31b214b857e740b6e1bacd1e84c191624620ad6a34f12c9c63a8dc9a83bac102
 SHA512:
-  metadata.gz: f72ed322a1dd7a738f28c13943394ca34f4c095bb9221770f02cdf918fa06c12ccb5332e4302f1ca837853afb4e3380710d82f6274c6316a68e1922bbeddcbd1
-  data.tar.gz: 4570d5e0bb716b56703cd6f8a33e9ddf6684c01c18e3b7a35039e292d26aa17620737aeb887034f4cfadd5d0f1a5edcadb6239e2d163974c4087caf580abf7ce
+  metadata.gz: a7d218b57fdddce2884ad7fcbf29c33e14caed2b82f17cf8cf2a2ca4a0e8e527facde280b0ee4887f164533646cad02ad13c309e618bff6d7fef5e0d8503ef55
+  data.tar.gz: c27e6d3d97bd5a9320c20cc19cca2da0416bc967aaabe5a6ba812874e966d57a1bf61aca491a7a2b0248618428da398a732b908920e59c6e174cc054d975c7ff

data/Cargo.lock

@@ -1644,7 +1644,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-server"
-version = "0.2.18"
+version = "0.2.19"
 dependencies = [
  "argon2",
  "async-channel",

data/ext/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.18"
+version = "0.2.19"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/ext/itsi_server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.2.18"
+version = "0.2.19"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/ext/itsi_server/extconf.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
-require "mkmf"
-require "rb_sys/mkmf"
+require 'mkmf'
+require 'rb_sys/mkmf'
 
-create_rust_makefile("itsi/server/itsi_server") do |r|
-  r.extra_rustflags = ["-C target-cpu=native"]
+create_rust_makefile('itsi/server/itsi_server') do |r|
+  r.extra_rustflags = ['-C target-cpu=native']
+  r.env = {
+    'BINDGEN_EXTRA_CLANG_ARGS' => '-include stdbool.h -std=c99'
+  }
 end

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

@@ -377,9 +377,13 @@ impl ClusterMode {
               }
               lifecycle_event = lifecycle_rx.recv() => match lifecycle_event{
                 Ok(lifecycle_event) => {
+                  debug!("Cluster mode received lifecycle event: {:?}", lifecycle_event);
                   if let Err(e) = self_ref.clone().handle_lifecycle_event(lifecycle_event).await{
                     match e {
-                      ItsiError::Break => break,
+                      ItsiError::Break => {
+                        debug!("Lifecycle event triggered shutdown, breaking cluster monitor loop");
+                        break;
+                      },
                       _ => error!("Error in handle_lifecycle_event {:?}", e)
                     }
                   }

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

@@ -1,11 +1,12 @@
 use std::{
     collections::VecDeque,
-    sync::atomic::{AtomicBool, AtomicI8},
+    sync::atomic::{AtomicBool, AtomicI8, Ordering},
 };
 
 use nix::libc::{self, sighandler_t};
 use parking_lot::Mutex;
 use tokio::sync::broadcast;
+use tracing::{debug, warn};
 
 use super::lifecycle_event::LifecycleEvent;
 
@@ -21,12 +22,14 @@ pub fn subscribe_runtime_to_signals() -> broadcast::Receiver<LifecycleEvent> {
     if let Some(sender) = guard.as_ref() {
         return sender.subscribe();
     }
-    let (sender, receiver) = broadcast::channel(5);
+    let (sender, receiver) = broadcast::channel(32);
     let sender_clone = sender.clone();
     std::thread::spawn(move || {
-        std::thread::sleep(std::time::Duration::from_millis(50));
+        std::thread::sleep(std::time::Duration::from_millis(10));
         for event in PENDING_QUEUE.lock().drain(..) {
-            sender_clone.send(event).ok();
+            if let Err(e) = sender_clone.send(event) {
+                eprintln!("Warning: Failed to send pending lifecycle event {:?}", e);
+            }
         }
     });
 
@@ -41,22 +44,36 @@ pub fn unsubscribe_runtime() {
 
 pub fn send_lifecycle_event(event: LifecycleEvent) {
     if let Some(sender) = SIGNAL_HANDLER_CHANNEL.lock().as_ref() {
-        sender.send(event).ok();
+        if let Err(e) = sender.send(event) {
+            // Channel full or receivers dropped - this is a critical error for shutdown signals
+            eprintln!("Critical: Failed to send lifecycle event {:?}", e);
+            // For shutdown events, try to force exit if channel delivery fails
+            if matches!(
+                e.0,
+                LifecycleEvent::Shutdown | LifecycleEvent::ForceShutdown
+            ) {
+                eprintln!("Emergency shutdown due to signal delivery failure");
+                std::process::exit(1);
+            }
+        }
     } else {
         PENDING_QUEUE.lock().push_back(event);
     }
 }
 
 fn receive_signal(signum: i32, _: sighandler_t) {
-    SIGINT_COUNT.fetch_add(-1, std::sync::atomic::Ordering::SeqCst);
+    debug!("Received signal: {}", signum);
+    SIGINT_COUNT.fetch_add(-1, Ordering::SeqCst);
     let event = match signum {
         libc::SIGTERM | libc::SIGINT => {
-            SHUTDOWN_REQUESTED.store(true, std::sync::atomic::Ordering::SeqCst);
-            SIGINT_COUNT.fetch_add(2, std::sync::atomic::Ordering::SeqCst);
-            if SIGINT_COUNT.load(std::sync::atomic::Ordering::SeqCst) < 2 {
+            debug!("Received shutdown signal (SIGTERM/SIGINT)");
+            SHUTDOWN_REQUESTED.store(true, Ordering::SeqCst);
+            SIGINT_COUNT.fetch_add(2, Ordering::SeqCst);
+            if SIGINT_COUNT.load(Ordering::SeqCst) < 2 {
+                debug!("First shutdown signal, requesting graceful shutdown");
                 Some(LifecycleEvent::Shutdown)
             } else {
-                // Not messing about. Force shutdown.
+                warn!("Multiple shutdown signals received, forcing immediate shutdown");
                 Some(LifecycleEvent::ForceShutdown)
             }
         }
@@ -70,13 +87,17 @@ fn receive_signal(signum: i32, _: sighandler_t) {
     };
 
     if let Some(event) = event {
+        debug!("Signal {} mapped to lifecycle event: {:?}", signum, event);
         send_lifecycle_event(event);
+    } else {
+        debug!("Signal {} not mapped to any lifecycle event", signum);
     }
 }
 
 pub fn reset_signal_handlers() -> bool {
-    SIGINT_COUNT.store(0, std::sync::atomic::Ordering::SeqCst);
-    SHUTDOWN_REQUESTED.store(false, std::sync::atomic::Ordering::SeqCst);
+    debug!("Resetting signal handlers");
+    SIGINT_COUNT.store(0, Ordering::SeqCst);
+    SHUTDOWN_REQUESTED.store(false, Ordering::SeqCst);
 
     unsafe {
         libc::signal(libc::SIGTERM, receive_signal as usize);
@@ -92,6 +113,7 @@ pub fn reset_signal_handlers() -> bool {
 }
 
 pub fn clear_signal_handlers() {
+    debug!("Clearing signal handlers");
     unsafe {
         libc::signal(libc::SIGTERM, libc::SIG_DFL);
         libc::signal(libc::SIGINT, libc::SIG_DFL);

data/lib/itsi/server/config/middleware/rate_limit.md

@@ -39,7 +39,7 @@ How to identify the client:
   ```
   or
   ```ruby
-  key: { parameter: { query:  { name: "user_id" } } }
+  key: { parameter: { query: "user_id" } }
   ```
 
 ### `store_config`

data/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.18"
+    VERSION = "0.2.19"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi-server
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Wouter Coppieters