Start on 0.2.18

Author: wouterken

.zed/settings.json

@@ -0,0 +1,32 @@
+// Folder-specific settings
+//
+// For a full list of overridable settings, and general information on folder-specific settings,
+// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
+{
+  "file_scan_exclusions": [
+    ".data",
+    ".git$",
+    ".hg",
+    ".rsync_cache",
+    "assets/webpack",
+    "build/static",
+    "client/build",
+    "CVS",
+    "node_modules",
+    "public/system/*",
+    "tmp/cache",
+    "**/.classpath",
+    "**/.DS_Store",
+    "**/.git",
+    "**/.hg",
+    "**/.settings",
+    "**/.svn",
+    "**/CVS",
+    "**/Thumbs.db",
+    ".svn",
+    "gems/scheduler/ext/*",
+    "gems/server/ext/*",
+    "benchmarks/results/*",
+    "docs/static/*"
+  ]
+}

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.2.18] - 2025-XX-XX
+### WIP
+-- Fixing error in auto-reload on Linux when reuse_port is false
+-- Fixing preload gem group logic
+-- Fix errors in interrupt handling during some debug flows
+
 ## [0.2.17] - 2025-05-31
 - Enabled vectorized writes in IoSteam
 - Replaced all usage of heap-allocated BoxBody with HttpBody enums

Cargo.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    itsi (0.2.17)
-      itsi-scheduler (~> 0.2.17)
-      itsi-server (~> 0.2.17)
+    itsi (0.2.18)
+      itsi-scheduler (~> 0.2.18)
+      itsi-server (~> 0.2.18)
 
 PATH
   remote: gems/scheduler
   specs:
-    itsi-scheduler (0.2.17)
+    itsi-scheduler (0.2.18)
       rb_sys (~> 0.9.91)
 
 PATH
   remote: gems/server
   specs:
-    itsi-server (0.2.17)
+    itsi-server (0.2.18)
       json (~> 2)
       prism (~> 1.4)
       rack (>= 1.6)

Gemfile.lock

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.17"
+version = "0.2.18"
 edition = "2021"
 authors = ["Wouter Coppieters <[email protected]>"]
 license = "MIT"

crates/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.2.17"
+version = "0.2.18"
 edition = "2021"
 authors = ["Wouter Coppieters <[email protected]>"]
 license = "MIT"

crates/itsi_server/Cargo.toml

@@ -16,7 +16,7 @@ use std::{
     sync::mpsc,
     thread::{self},
 };
-use tracing::debug;
+use tracing::{debug, info};
 
 /// Represents a set of patterns and commands.
 #[derive(Debug, Clone)]
@@ -96,7 +96,15 @@ pub fn watch_groups(pattern_groups: Vec<(String, Vec<Vec<String>>)>) -> Result<O
         let mut groups = Vec::new();
         for (pattern, commands) in pattern_groups.into_iter() {
             let base_dir = extract_and_canonicalize_base_dir(&pattern);
-            let glob = Glob::new(pattern.trim_start_matches("./")).map_err(|e| {
+            let cwd = PathBuf::from(".").canonicalize().unwrap();
+            let relative_base_dir = base_dir.strip_prefix(&cwd).unwrap_or(&base_dir);
+            info!(
+                "Trimming pattern {:?} from {:?}",
+                relative_base_dir, pattern
+            );
+
+            let pattern = pattern.trim_start_matches(relative_base_dir.to_str().unwrap());
+            let glob = Glob::new(pattern).map_err(|e| {
                 magnus::Error::new(
                     magnus::exception::standard_error(),
                     format!("Failed to create watch glob: {}", e),
@@ -111,8 +119,8 @@ pub fn watch_groups(pattern_groups: Vec<(String, Vec<Vec<String>>)>) -> Result<O
             groups.push(PatternGroup {
                 base_dir,
                 glob_set,
-                pattern,
                 commands,
+                pattern: pattern.to_string(),
                 last_triggered: None,
             });
         }

crates/itsi_server/src/ruby_types/itsi_server/file_watcher.rs

@@ -84,7 +84,7 @@ pub struct ServerParams {
     listener_info: Mutex<HashMap<String, i32>>,
     pub itsi_server_token_preference: ItsiServerTokenPreference,
     pub preloaded: AtomicBool,
-    socket_opts: SocketOpts,
+    pub socket_opts: SocketOpts,
     preexisting_listeners: Option<String>,
 }
 
@@ -442,6 +442,10 @@ impl ItsiServerConfig {
         }
     }
 
+    pub fn use_reuse_port_load_balancing(&self) -> bool {
+        cfg!(target_os = "linux") && self.server_params.read().socket_opts.reuse_port
+    }
+
     /// Reload
     pub fn reload(self: Arc<Self>, cluster_worker: bool) -> Result<bool> {
         let server_params = call_with_gvl(|ruby| {

crates/itsi_server/src/ruby_types/itsi_server/itsi_server_config.rs

@@ -304,16 +304,16 @@ impl Listener {
         connect_tcp_socket(ip, port, &socket_opts).unwrap()
     }
 
-    pub fn into_tokio_listener(self, no_rebind: bool) -> TokioListener {
+    pub fn into_tokio_listener(self, should_rebind: bool) -> TokioListener {
         match self {
             Listener::Tcp(mut listener) => {
-                if cfg!(target_os = "linux") && !no_rebind {
+                if should_rebind {
                     listener = Listener::rebind_listener(listener);
                 }
                 TokioListener::Tcp(TokioTcpListener::from_std(listener).unwrap())
             }
             Listener::TcpTls((mut listener, acceptor)) => {
-                if cfg!(target_os = "linux") && !no_rebind {
+                if should_rebind {
                     listener = Listener::rebind_listener(listener);
                 }
                 TokioListener::TcpTls(

crates/itsi_server/src/server/binds/listener.rs

@@ -321,15 +321,6 @@ impl ClusterMode {
             .iter()
             .try_for_each(|worker| worker.boot(Arc::clone(&self)))?;
 
-        if cfg!(target_os = "linux") {
-            self.server_config
-                .server_params
-                .write()
-                .listeners
-                .lock()
-                .drain(..);
-        };
-
         let (sender, mut receiver) = watch::channel(());
         *CHILD_SIGNAL_SENDER.lock() = Some(sender);
 

crates/itsi_server/src/server/serve_strategy/cluster_mode.rs

@@ -262,7 +262,14 @@ impl SingleMode {
         let shutdown_timeout = self.server_config.server_params.read().shutdown_timeout;
         let (shutdown_sender, _) = watch::channel(RunningPhase::Running);
         let monitor_thread = self.clone().start_monitors(thread_workers.clone());
+
+        // If we're on Linux with reuse_port enabled, we can use
+        // kernel level load balancing across processes sharing a port.
+        // To take advantage of this, these forks will rebind to the same port upon boot.
+        // Worker 0 is special (this one just inherits the bind from the master process).
         let is_zero_worker = self.is_zero_worker();
+        let should_rebind = !is_zero_worker || self.server_config.use_reuse_port_load_balancing();
+
         if monitor_thread.is_none() {
             error!("Failed to start monitor thread");
             return Err(ItsiError::new("Failed to start monitor thread"));
@@ -283,7 +290,7 @@ impl SingleMode {
                 .listeners
                 .lock()
                 .drain(..)
-                .map(|list| Arc::new(list.into_tokio_listener(is_zero_worker)))
+                .map(|list| Arc::new(list.into_tokio_listener(should_rebind)))
                 .collect::<Vec<_>>();
 
             tokio_listeners.iter().cloned().for_each(|listener| {

crates/itsi_server/src/server/serve_strategy/single_mode.rs

@@ -2,6 +2,6 @@
 
 module Itsi
   class Scheduler
-    VERSION = "0.2.17"
+    VERSION = "0.2.18"
   end
 end

gems/scheduler/Cargo.lock

@@ -4,7 +4,6 @@
 require "itsi/server"
 require "optparse"
 
-
 COMMANDS = {
   "init" => "Initialize a new Itsi.rb server configuration file",
   "status" => "Show the status of the server",
@@ -119,7 +118,6 @@ parser = OptionParser.new do |opts|
     options[:shutdown_timeout] = shutdown_timeout
   end
 
-
   opts.on("--stream-body", TrueClass, "Stream body frames (default: false for best compatibility)") do |stream_body|
     options[:stream_body] = stream_body
   end
@@ -159,7 +157,7 @@ parser = OptionParser.new do |opts|
   end
 end
 
-if ENV['COMP_LINE'] || ARGV.include?('--completion')
+if ENV["COMP_LINE"] || ARGV.include?("--completion")
   puts COMMANDS.keys
   exit
 end
@@ -173,7 +171,7 @@ end
 
 case (command = ARGV.shift)
 when *COMMANDS.keys
-  required_arity = Itsi::Server.method(command).parameters&.select{|c| c.first == :req }&.length&.succ || 2
+  required_arity = Itsi::Server.method(command).parameters&.select { |c| c.first == :req }&.length&.succ || 2
   case required_arity
   when 1 then Itsi::Server.send(command)
   when 2 then Itsi::Server.send(command, options)

gems/scheduler/lib/itsi/scheduler/version.rb

@@ -97,7 +97,7 @@ def self.build_config(args, config_file_path, builder_proc = nil)
             errors << [e, e.backtrace[0]]
           end
         # If we're just preloading a specific gem group, we'll do that here too
-        when Symbol
+        when Symbol, String
           Itsi.log_debug("Preloading gem group #{preload}")
           Bundler.require(preload)
         end

gems/server/Cargo.lock

@@ -2,17 +2,15 @@ module Itsi
   class Server
     module Config
       class ReusePort < Option
-
         insert_text <<~SNIPPET
-        reuse_port ${1|true,false|}
+          reuse_port ${1|true,false|}
         SNIPPET
 
         detail "Configures whether the server should set the reuse_port option on the underlying socket."
 
         schema do
-          (Bool() & Required()).default(false)
+          (Bool() & Required()).default(true)
         end
-
       end
     end
   end

gems/server/exe/itsi

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

gems/server/lib/itsi/server/config.rb

@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'itsi-scheduler', '~> 0.2.17'
-  spec.add_dependency 'itsi-server', '~> 0.2.17'
+  spec.add_dependency 'itsi-scheduler', '~> 0.2.18'
+  spec.add_dependency 'itsi-server', '~> 0.2.18'
 end

gems/server/lib/itsi/server/config/options/reuse_port.rb

@@ -1,3 +1,3 @@
 module Itsi
-  VERSION = '0.2.17'
+  VERSION = '0.2.18'
 end