itsi-scheduler 0.1.5 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75599726844e215e80b59ae8a95549e23024e4e070d768ca3f085a8fbb2591a9
-  data.tar.gz: c84726c45c08562ad4b8ebd4a6c9eb4ebd1f50521afca027c1e6a69d8b2e4eb5
+  metadata.gz: '06169b51c9344ad3892f08cf099c459f9bea7377d7e7b3342a54b9314e7f0c8f'
+  data.tar.gz: d18702aac863d7bf49c100cbcd0be525031d8ed7f334368d507c9ffee53abcbd
 SHA512:
-  metadata.gz: 0a944a2d952111520bf473853ec7b363ed16a53ddf4b0ae252c0fab36d70b4dedb561d55feab827d34c21b0d468cb6b0e978dba22584bc873092cc3d9515a7af
-  data.tar.gz: 5e27924c41ebc8f6b84f8d1e507ff04d3d86d8326c2da21ca2cbe4b1fc703b7bd0026813cf8353775e126d562e25cae93ed8c03f714b07eb48c4d3e15b91fc94
+  metadata.gz: 54a585ef25065bcf8e038a87d80a214a1a17aac9f5510a083d6598928d48c879866d89723c399473faf8ef96f8464a5c2b0b3f3d0d24cdc551e11aae9574b9fe
+  data.tar.gz: 3c102f1994d0c6beee8473261fe49a206addcd04f80afdc09a0eaf8ebf6d31f738cbfbc4afa00dff0d9790a65fa426e0bd7e34c4e7f341231a9b4c036bc0583d

data/Cargo.lock

@@ -68,9 +68,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
 dependencies = [
  "shlex",
 ]
@@ -186,9 +186,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "itsi-scheduler"
@@ -507,9 +507,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.10"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
 dependencies = [
  "bitflags",
 ]
@@ -560,9 +560,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "ring"
-version = "0.17.11"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
@@ -586,9 +586,9 @@ checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "scopeguard"
@@ -624,9 +624,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
 dependencies = [
  "itoa",
  "memchr",

data/ext/itsi_error/src/from.rs

@@ -1,5 +1,12 @@
+use magnus::{
+    Error,
+    error::ErrorType,
+    exception::{self, arg_error, exception},
+};
+use nix::errno::Errno;
+
 use crate::ItsiError;
-use std::ffi::NulError;
+use std::{ffi::NulError, io};
 
 pub static CLIENT_CONNECTION_CLOSED: &str = "Client disconnected";
 
@@ -9,14 +16,14 @@ impl From<httparse::Error> for ItsiError {
     }
 }
 
-impl From<nix::errno::Errno> for ItsiError {
-    fn from(err: nix::errno::Errno) -> Self {
+impl From<Errno> for ItsiError {
+    fn from(err: Errno) -> Self {
         ItsiError::ArgumentError(err.to_string())
     }
 }
 
-impl From<std::io::Error> for ItsiError {
-    fn from(err: std::io::Error) -> Self {
+impl From<io::Error> for ItsiError {
+    fn from(err: io::Error) -> Self {
         ItsiError::ArgumentError(err.to_string())
     }
 }
@@ -33,39 +40,29 @@ impl From<NulError> for ItsiError {
     }
 }
 
-impl From<magnus::Error> for ItsiError {
-    fn from(err: magnus::Error) -> Self {
+impl From<Error> for ItsiError {
+    fn from(err: Error) -> Self {
         match err.error_type() {
-            magnus::error::ErrorType::Jump(tag) => ItsiError::Jump(tag.to_string()),
-            magnus::error::ErrorType::Error(_exception_class, cow) => {
-                ItsiError::ArgumentError(cow.to_string())
-            }
-            magnus::error::ErrorType::Exception(exception) => {
-                ItsiError::ArgumentError(exception.to_string())
-            }
+            ErrorType::Jump(tag) => ItsiError::Jump(tag.to_string()),
+            ErrorType::Error(_exception_class, cow) => ItsiError::ArgumentError(cow.to_string()),
+            ErrorType::Exception(exception) => ItsiError::ArgumentError(exception.to_string()),
         }
     }
 }
 
-impl From<ItsiError> for magnus::Error {
+impl From<ItsiError> for Error {
     fn from(err: ItsiError) -> Self {
         match err {
-            ItsiError::InvalidInput(msg) => magnus::Error::new(magnus::exception::arg_error(), msg),
-            ItsiError::InternalServerError(msg) => {
-                magnus::Error::new(magnus::exception::exception(), msg)
-            }
-            ItsiError::UnsupportedProtocol(msg) => {
-                magnus::Error::new(magnus::exception::arg_error(), msg)
-            }
-            ItsiError::ArgumentError(msg) => {
-                magnus::Error::new(magnus::exception::arg_error(), msg)
-            }
-            ItsiError::Jump(msg) => magnus::Error::new(magnus::exception::local_jump_error(), msg),
-            ItsiError::Break() => magnus::Error::new(magnus::exception::interrupt(), "Break"),
+            ItsiError::InvalidInput(msg) => Error::new(arg_error(), msg),
+            ItsiError::InternalServerError(msg) => Error::new(exception(), msg),
+            ItsiError::UnsupportedProtocol(msg) => Error::new(arg_error(), msg),
+            ItsiError::ArgumentError(msg) => Error::new(arg_error(), msg),
+            ItsiError::Jump(msg) => Error::new(exception::local_jump_error(), msg),
+            ItsiError::Break() => Error::new(exception::interrupt(), "Break"),
             ItsiError::ClientConnectionClosed => {
-                magnus::Error::new(magnus::exception::eof_error(), CLIENT_CONNECTION_CLOSED)
+                Error::new(exception::eof_error(), CLIENT_CONNECTION_CLOSED)
             }
-            ItsiError::Pass() => magnus::Error::new(magnus::exception::interrupt(), "Pass"),
+            ItsiError::Pass() => Error::new(exception::interrupt(), "Pass"),
         }
     }
 }

data/ext/itsi_error/src/lib.rs

@@ -3,7 +3,7 @@ use thiserror::Error;
 
 pub type Result<T> = std::result::Result<T, ItsiError>;
 
-#[derive(Error, Debug)]
+#[derive(Error, Debug, Clone)]
 pub enum ItsiError {
     #[error("Invalid input {0}")]
     InvalidInput(String),

data/ext/itsi_rb_helpers/src/lib.rs

@@ -1,7 +1,8 @@
-use std::{os::raw::c_void, ptr::null_mut, sync::Arc};
+use std::{os::raw::c_void, ptr::null_mut};
 
 use magnus::{
     RArray, Ruby, Thread, Value,
+    block::Proc,
     rb_sys::FromRawValue,
     value::{LazyId, ReprValue},
 };
@@ -17,6 +18,7 @@ static ID_LIST: LazyId = LazyId::new("list");
 static ID_EQ: LazyId = LazyId::new("==");
 static ID_ALIVE: LazyId = LazyId::new("alive?");
 static ID_THREAD_VARIABLE_GET: LazyId = LazyId::new("thread_variable_get");
+static ID_BACKTRACE: LazyId = LazyId::new("backtrace");
 
 pub fn schedule_thread() {
     unsafe {
@@ -120,20 +122,30 @@ where
     *result_box
 }
 
-pub fn fork(after_fork: Arc<Option<impl Fn()>>) -> Option<i32> {
+pub fn fork(after_fork: Option<HeapValue<Proc>>) -> Option<i32> {
     let ruby = Ruby::get().unwrap();
     let fork_result = ruby
         .module_kernel()
         .funcall::<_, _, Option<i32>>(*ID_FORK, ())
         .unwrap();
     if fork_result.is_none() {
-        if let Some(f) = &*after_fork {
-            f()
+        if let Some(proc) = after_fork {
+            call_proc_and_log_errors(proc)
         }
     }
     fork_result
 }
 
+pub fn call_proc_and_log_errors(proc: HeapValue<Proc>) {
+    if let Err(e) = proc.call::<_, Value>(()) {
+        if let Some(value) = e.value() {
+            print_rb_backtrace(value);
+        } else {
+            eprintln!("Error occurred {:?}", e);
+        }
+    }
+}
+
 pub fn kill_threads<T>(threads: Vec<T>)
 where
     T: ReprValue,
@@ -176,3 +188,14 @@ pub fn terminate_non_fork_safe_threads() {
 
     kill_threads(non_fork_safe_threads);
 }
+
+pub fn print_rb_backtrace(rb_err: Value) {
+    let backtrace = rb_err
+        .funcall::<_, _, Vec<String>>(*ID_BACKTRACE, ())
+        .unwrap_or_default();
+
+    eprintln!("Ruby exception {:?}", rb_err);
+    for line in backtrace {
+        eprintln!("{}", line);
+    }
+}