itsi-scheduler 0.1.11 → 0.1.12

data/ext/itsi_tracing/src/lib.rs

@@ -1,58 +1,229 @@
-use std::env;
-
 use atty::{Stream, is};
-use tracing::level_filters::LevelFilter;
-pub use tracing::{debug, error, info, trace, warn};
-pub use tracing_attributes::instrument; // Explicitly export from tracing-attributes
-use tracing_subscriber::{
-    EnvFilter, Layer,
-    fmt::{self, format},
-    layer::SubscriberExt,
+use std::{
+    env,
+    sync::{Mutex, OnceLock},
 };
+pub use tracing::{debug, error, info, trace, warn};
+use tracing_appender::rolling;
+use tracing_subscriber::Layer;
+use tracing_subscriber::fmt::writer::BoxMakeWriter;
+use tracing_subscriber::{EnvFilter, fmt, prelude::*, reload};
+
+// Global reload handle for changing the level at runtime.
+static RELOAD_HANDLE: OnceLock<
+    Mutex<Option<reload::Handle<EnvFilter, tracing_subscriber::Registry>>>,
+> = OnceLock::new();
+
+/// Log format: Plain or JSON.
+#[derive(Debug, Clone)]
+pub enum LogFormat {
+    Plain,
+    Json,
+}
+
+/// Log target: STDOUT, File, or Both.
+#[derive(Debug, Clone)]
+pub enum LogTarget {
+    Stdout,
+    File(String), // file name (rotated daily)
+    Both(String), // file name (rotated daily) plus STDOUT
+}
+
+/// Logger configuration.
+#[derive(Debug, Clone)]
+pub struct LogConfig {
+    /// Log level as a string (e.g. "info", "debug").
+    pub level: String,
+    /// Format: Plain (with optional ANSI) or JSON.
+    pub format: LogFormat,
+    /// Target: STDOUT, File, or Both.
+    pub target: LogTarget,
+    /// Whether to enable ANSI coloring (for plain text).
+    pub use_ansi: bool,
+}
 
-#[instrument]
+impl Default for LogConfig {
+    fn default() -> Self {
+        let level = env::var("ITSI_LOG").unwrap_or_else(|_| "info".into());
+        let format = match env::var("ITSI_LOG_FORMAT").as_deref() {
+            Ok("json") => LogFormat::Json,
+            _ => LogFormat::Plain,
+        };
+        let target = match env::var("ITSI_LOG_TARGET").as_deref() {
+            Ok("file") => {
+                let file = env::var("ITSI_LOG_FILE").unwrap_or_else(|_| "app.log".into());
+                LogTarget::File(file)
+            }
+            Ok("both") => {
+                let file = env::var("ITSI_LOG_FILE").unwrap_or_else(|_| "app.log".into());
+                LogTarget::Both(file)
+            }
+            _ => LogTarget::Stdout,
+        };
+        // If ITSI_LOG_ANSI is set, use that; otherwise, use ANSI if stdout is a TTY.
+        let use_ansi = env::var("ITSI_LOG_ANSI")
+            .map(|s| s == "true")
+            .unwrap_or_else(|_| is(Stream::Stdout));
+        Self {
+            level,
+            format,
+            target,
+            use_ansi,
+        }
+    }
+}
+
+/// Initialize the global tracing subscriber with the default configuration.
 pub fn init() {
-    let env_filter = EnvFilter::builder()
-        .with_env_var("ITSI_LOG")
-        .try_from_env()
-        .unwrap_or_else(|_| EnvFilter::new("info"));
-
-    let format = fmt::format()
-        .compact()
-        .with_file(false)
-        .with_level(true)
-        .with_line_number(false)
-        .with_source_location(false)
-        .with_target(false)
-        .with_thread_ids(false);
-
-    let is_tty = is(Stream::Stdout);
-
-    let subscriber = tracing_subscriber::fmt()
-        .event_format(format)
-        .with_env_filter(env_filter);
-
-    if (is_tty && env::var("ITSI_LOG_PLAIN").is_err()) || env::var("ITSI_LOG_ANSI").is_ok() {
-        subscriber.with_ansi(true).init();
+    init_with_config(LogConfig::default());
+}
+
+/// Initialize the global tracing subscriber with a given configuration.
+pub fn init_with_config(config: LogConfig) {
+    // Build an EnvFilter from the configured level.
+    let env_filter = EnvFilter::new(config.level);
+
+    // Build the formatting layer based on target and format.
+    let fmt_layer = match config.target {
+        LogTarget::Stdout => match config.format {
+            LogFormat::Plain => fmt::layer()
+                .compact()
+                .with_file(false)
+                .with_line_number(false)
+                .with_target(false)
+                .with_thread_ids(false)
+                .with_writer(BoxMakeWriter::new(std::io::stdout))
+                .with_ansi(config.use_ansi)
+                .boxed(),
+            LogFormat::Json => fmt::layer()
+                .compact()
+                .with_file(false)
+                .with_line_number(false)
+                .with_target(false)
+                .with_thread_ids(false)
+                .with_writer(BoxMakeWriter::new(std::io::stdout))
+                .with_ansi(config.use_ansi)
+                .json()
+                .boxed(),
+        },
+        LogTarget::File(file) => match config.format {
+            LogFormat::Plain => fmt::layer()
+                .compact()
+                .with_file(false)
+                .with_line_number(false)
+                .with_target(false)
+                .with_thread_ids(false)
+                .with_writer(BoxMakeWriter::new({
+                    let file = file.clone();
+                    move || rolling::daily(".", file.clone())
+                }))
+                .with_ansi(false)
+                .boxed(),
+            LogFormat::Json => fmt::layer()
+                .compact()
+                .with_file(false)
+                .with_line_number(false)
+                .with_target(false)
+                .with_thread_ids(false)
+                .with_writer(BoxMakeWriter::new({
+                    let file = file.clone();
+                    move || rolling::daily(".", file.clone())
+                }))
+                .with_ansi(false)
+                .json()
+                .boxed(),
+        },
+        LogTarget::Both(file) => {
+            // For "Both" target, handle each format separately to avoid type mismatches
+            match config.format {
+                LogFormat::Plain => {
+                    let stdout_layer = fmt::layer()
+                        .compact()
+                        .with_file(false)
+                        .with_line_number(false)
+                        .with_target(false)
+                        .with_thread_ids(false)
+                        .with_writer(BoxMakeWriter::new(std::io::stdout))
+                        .with_ansi(config.use_ansi);
+
+                    let file_layer = fmt::layer()
+                        .compact()
+                        .with_file(false)
+                        .with_line_number(false)
+                        .with_target(false)
+                        .with_thread_ids(false)
+                        .with_writer(BoxMakeWriter::new({
+                            let file = file.clone();
+                            move || rolling::daily(".", file.clone())
+                        }))
+                        .with_ansi(false);
+
+                    stdout_layer.and_then(file_layer).boxed()
+                }
+                LogFormat::Json => {
+                    let stdout_layer = fmt::layer()
+                        .compact()
+                        .with_file(false)
+                        .with_line_number(false)
+                        .with_target(false)
+                        .with_thread_ids(false)
+                        .with_writer(BoxMakeWriter::new(std::io::stdout))
+                        .with_ansi(config.use_ansi)
+                        .json();
+
+                    let file_layer = fmt::layer()
+                        .compact()
+                        .with_file(false)
+                        .with_line_number(false)
+                        .with_target(false)
+                        .with_thread_ids(false)
+                        .with_writer(BoxMakeWriter::new({
+                            let file = file.clone();
+                            move || rolling::daily(".", file.clone())
+                        }))
+                        .with_ansi(false)
+                        .json();
+
+                    stdout_layer.and_then(file_layer).boxed()
+                }
+            }
+        }
+    };
+
+    // Create a reloadable filter layer so we can update the level at runtime.
+    let (filter_layer, handle) = reload::Layer::new(env_filter);
+
+    // Build the subscriber registry
+    let subscriber = tracing_subscriber::registry()
+        .with(filter_layer)
+        .with(fmt_layer);
+
+    tracing::subscriber::set_global_default(subscriber)
+        .expect("Unable to set global tracing subscriber");
+
+    RELOAD_HANDLE.set(Mutex::new(Some(handle))).unwrap();
+}
+
+/// Change the log level at runtime.
+pub fn set_level(new_level: &str) {
+    if let Some(handle) = RELOAD_HANDLE.get().unwrap().lock().unwrap().as_ref() {
+        handle
+            .modify(|filter| *filter = EnvFilter::new(new_level))
+            .expect("Failed to update log level");
     } else {
-        subscriber
-            .fmt_fields(format::JsonFields::default())
-            .event_format(fmt::format().json())
-            .init();
+        eprintln!("Reload handle not initialized; call init() first.");
     }
 }
 
+/// Run a function silently by temporarily setting a no-op subscriber.
 pub fn run_silently<F, R>(f: F) -> R
 where
     F: FnOnce() -> R,
 {
-    // Build a minimal subscriber that filters *everything* out
-    let no_op_subscriber =
-        tracing_subscriber::registry().with(fmt::layer().with_filter(LevelFilter::OFF));
-
-    // Turn that subscriber into a `Dispatch`
-    let no_op_dispatch = tracing::dispatcher::Dispatch::new(no_op_subscriber);
-
-    // Temporarily set `no_op_dispatch` as the *default* within this closure
-    tracing::dispatcher::with_default(&no_op_dispatch, f)
+    let no_op_subscriber = tracing_subscriber::fmt()
+        .with_writer(std::io::sink)
+        .with_max_level(tracing_subscriber::filter::LevelFilter::OFF)
+        .finish();
+    let dispatch = tracing::Dispatch::new(no_op_subscriber);
+    tracing::dispatcher::with_default(&dispatch, f)
 }

data/lib/itsi/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Scheduler
-    VERSION = "0.1.11"
+    VERSION = "0.1.12"
   end
 end

data/lib/itsi/scheduler.rb

@@ -73,7 +73,7 @@ module Itsi
         fiber.resume
       end
     rescue StandardError => e
-      warn "Failed to resume fiber #{fiber}: #{e.message}"
+      warn "Fiber #{fiber} terminated on exception: #{e.message}"
     end
 
     def resume_fiber_with_readiness((token, readiness))
@@ -81,7 +81,7 @@ module Itsi
         fiber.resume(readiness)
       end
     rescue StandardError => e
-      warn "Failed to resume fiber #{fiber}: #{e.message}"
+      warn "Fiber #{fiber} terminated on exception: #{e.message}"
     end
 
     def resume_blocked(fiber)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: itsi-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Wouter Coppieters
 bindir: exe
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys
@@ -40,18 +40,42 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- _index.md
 - ext/itsi_error/Cargo.lock
 - ext/itsi_error/Cargo.toml
 - ext/itsi_error/src/from.rs
 - ext/itsi_error/src/lib.rs
+- ext/itsi_error/target/debug/build/clang-sys-da71b0344e568175/out/common.rs
+- ext/itsi_error/target/debug/build/clang-sys-da71b0344e568175/out/dynamic.rs
+- ext/itsi_error/target/debug/build/clang-sys-da71b0344e568175/out/macros.rs
+- ext/itsi_error/target/debug/build/rb-sys-49f554618693db24/out/bindings-0.9.110-mri-arm64-darwin23-3.4.2.rs
+- ext/itsi_error/target/debug/incremental/itsi_error-1mmt5sux7jb0i/s-h510z7m8v9-0bxu7yd.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-2vn3jey74oiw0/s-h5113n0e7e-1v5qzs6.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-37uv9dicz7awp/s-h510ykifhe-0tbnep2.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-37uv9dicz7awp/s-h510yyocpj-0tz7ug7.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-37uv9dicz7awp/s-h510z0xc8g-14ol18k.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3g5qf4y7d54uj/s-h5113n0e7d-1trk8on.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3lpfftm45d3e2/s-h510z7m8r3-1pxp20o.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3o4qownhl3d7n/s-h510ykifek-1uxasnk.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3o4qownhl3d7n/s-h510yyocki-11u37qm.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3o4qownhl3d7n/s-h510z0xc93-0pmy0zm.lock
 - ext/itsi_instrument_entry/Cargo.toml
 - ext/itsi_instrument_entry/src/lib.rs
 - ext/itsi_rb_helpers/Cargo.lock
 - ext/itsi_rb_helpers/Cargo.toml
 - ext/itsi_rb_helpers/src/heap_value.rs
 - ext/itsi_rb_helpers/src/lib.rs
+- ext/itsi_rb_helpers/target/debug/build/clang-sys-da71b0344e568175/out/common.rs
+- ext/itsi_rb_helpers/target/debug/build/clang-sys-da71b0344e568175/out/dynamic.rs
+- ext/itsi_rb_helpers/target/debug/build/clang-sys-da71b0344e568175/out/macros.rs
+- ext/itsi_rb_helpers/target/debug/build/rb-sys-eb9ed4ff3a60f995/out/bindings-0.9.110-mri-arm64-darwin23-3.4.2.rs
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-040pxg6yhb3g3/s-h5113n7a1b-03bwlt4.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-131g1u4dzkt1a/s-h51113xnh3-1eik1ip.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-131g1u4dzkt1a/s-h5111704jj-0g4rj8x.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-1q2d3drtxrzs5/s-h5113n79yl-0bxcqc5.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-374a9h7ovycj0/s-h51113xoox-10de2hp.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-374a9h7ovycj0/s-h5111704w7-0vdq7gq.lock
 - ext/itsi_scheduler/Cargo.toml
-- ext/itsi_scheduler/extconf.rb
 - ext/itsi_scheduler/src/itsi_scheduler.rs
 - ext/itsi_scheduler/src/itsi_scheduler/io_helpers.rs
 - ext/itsi_scheduler/src/itsi_scheduler/io_waiter.rs
@@ -59,34 +83,75 @@ files:
 - ext/itsi_scheduler/src/lib.rs
 - ext/itsi_server/Cargo.lock
 - ext/itsi_server/Cargo.toml
-- ext/itsi_server/extconf.rb
-- ext/itsi_server/src/body_proxy/big_bytes.rs
-- ext/itsi_server/src/body_proxy/itsi_body_proxy.rs
-- ext/itsi_server/src/body_proxy/mod.rs
 - ext/itsi_server/src/env.rs
 - ext/itsi_server/src/lib.rs
-- ext/itsi_server/src/request/itsi_request.rs
-- ext/itsi_server/src/request/mod.rs
-- ext/itsi_server/src/response/itsi_response.rs
-- ext/itsi_server/src/response/mod.rs
+- ext/itsi_server/src/ruby_types/itsi_body_proxy/big_bytes.rs
+- ext/itsi_server/src/ruby_types/itsi_body_proxy/mod.rs
+- ext/itsi_server/src/ruby_types/itsi_grpc_request.rs
+- ext/itsi_server/src/ruby_types/itsi_grpc_response.rs
+- ext/itsi_server/src/ruby_types/itsi_grpc_stream/mod.rs
+- ext/itsi_server/src/ruby_types/itsi_http_request.rs
+- ext/itsi_server/src/ruby_types/itsi_http_response.rs
+- ext/itsi_server/src/ruby_types/itsi_server.rs
+- ext/itsi_server/src/ruby_types/itsi_server/file_watcher.rs
+- ext/itsi_server/src/ruby_types/itsi_server/itsi_server_config.rs
+- ext/itsi_server/src/ruby_types/mod.rs
 - ext/itsi_server/src/server/bind.rs
 - ext/itsi_server/src/server/bind_protocol.rs
+- ext/itsi_server/src/server/byte_frame.rs
+- ext/itsi_server/src/server/cache_store.rs
 - ext/itsi_server/src/server/io_stream.rs
-- ext/itsi_server/src/server/itsi_server.rs
+- ext/itsi_server/src/server/itsi_service.rs
 - ext/itsi_server/src/server/lifecycle_event.rs
 - ext/itsi_server/src/server/listener.rs
+- ext/itsi_server/src/server/middleware_stack/middleware.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/allow_list.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/auth_api_key.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/auth_basic.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/auth_jwt.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/cache_control.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/compression.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/cors.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/deny_list.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/error_response.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/etag.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/grpc_service.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/header_interpretation.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/intrusion_protection.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/log_requests.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/mod.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/proxy.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/rate_limit.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/redirect.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/request_headers.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/response_headers.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/ruby_app.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/static_assets.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/string_rewrite.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/token_source.rs
+- ext/itsi_server/src/server/middleware_stack/mod.rs
 - ext/itsi_server/src/server/mod.rs
 - ext/itsi_server/src/server/process_worker.rs
+- ext/itsi_server/src/server/rate_limiter.rs
+- ext/itsi_server/src/server/request_job.rs
 - ext/itsi_server/src/server/serve_strategy/cluster_mode.rs
 - ext/itsi_server/src/server/serve_strategy/mod.rs
 - ext/itsi_server/src/server/serve_strategy/single_mode.rs
 - ext/itsi_server/src/server/signal.rs
+- ext/itsi_server/src/server/static_file_server.rs
 - ext/itsi_server/src/server/thread_worker.rs
 - ext/itsi_server/src/server/tls.rs
 - ext/itsi_server/src/server/tls/locked_dir_cache.rs
+- ext/itsi_server/src/server/types.rs
 - ext/itsi_tracing/Cargo.lock
 - ext/itsi_tracing/Cargo.toml
 - ext/itsi_tracing/src/lib.rs
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-0994n8rpvvt9m/s-h510hfz1f6-1kbycmq.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-0bob7bf4yq34i/s-h5113125h5-0lh4rag.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-2fcodulrxbbxo/s-h510h2infk-0hp5kjw.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-2iak63r1woi1l/s-h510h2in4q-0kxfzw1.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-2kk4qj9gn5dg2/s-h5113124kv-0enwon2.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-2mwo0yas7dtw4/s-h510hfz1ha-1udgpei.lock
 - lib/itsi/scheduler.rb
 - lib/itsi/scheduler/version.rb
 - sig/itsi_scheduler.rbs

data/ext/itsi_server/extconf.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require "mkmf"
-require "rb_sys/mkmf"
-
-create_rust_makefile("itsi/server/itsi_server")

data/ext/itsi_server/src/body_proxy/mod.rs

@@ -1,2 +0,0 @@
-pub mod big_bytes;
-pub mod itsi_body_proxy;

data/ext/itsi_server/src/request/mod.rs

@@ -1 +0,0 @@
-pub mod itsi_request;

data/ext/itsi_server/src/response/mod.rs

@@ -1 +0,0 @@
-pub mod itsi_response;