tanker-core 4.2.1.alpha.8 → 4.2.1.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bca4633e82001cf61c6e6fc7a1195e8d004ca0870c915e44e652fd5454b9e86
-  data.tar.gz: 49a1673c1ce7868e0b2e4a2b450e12adbb53175cf80a69aade9ea356138f9008
+  metadata.gz: 4468a16f8acee2c9c627778aeda6c59c0bcd8173015723bfa752303dfddd310b
+  data.tar.gz: daacb13259fc02344ca588634d79109ce6146ab4b7a2de43f9c4d489ae897a93
 SHA512:
-  metadata.gz: 5bed10a2c6bc5c3ee78e33741be050fe06f60701893c5f67159336d420e1fa04a17c8e44b505d6382b27775db29b9b0be5867c78d4ca4d18f038b42bf149551c
-  data.tar.gz: d289a1dfe0203656392bf0f51ac67218b365ed38b8ea7191f9fa88860ea794b829130c6476886362a8bfed71ea128719075a7cc0be566b238f2048bdc8bf2d82
+  metadata.gz: 4cbe6918aec04bc6c490ad5c84ab81efc02e08b884f7c1fa17d31cc01d832b78e05c6c2d753102ae467184f4286826095d37c53d1762b3249b922d45af37be8e
+  data.tar.gz: a9b209637053e7f24e4f6b1745bb98a519bc5dc89f7e58799e64d11977fa5ac42a753ba86f07f3ed594c64ec7bce7721dae5488b421818ae4f45bd6449a2881c

data/lib/tanker/c_tanker/fork_hook.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
-require 'tanker/core/http'
-
 module Tanker
-  module ForkHook
-    def _fork(*args)
-      puts "### PID=#{Process.pid} TANKER-CORE BEFORE FORK HOOK"
-      CTanker.tanker_before_fork
-      Http::ThreadPool.before_fork
-
-      res = super
+  module CTanker
+    module ForkHook
+      def _fork(*args)
+        CTanker.tanker_before_fork
+        super
+      ensure
+        CTanker.tanker_after_fork
+      end
 
-      CTanker.tanker_after_fork
-      puts "### PID=#{Process.pid} TANKER-CORE AFTER FORK HOOK"
-      res
+      def self.install
+        Process.singleton_class.prepend(self)
+      end
     end
-    prepend_features(Process.singleton_class)
   end
 end

data/lib/tanker/c_tanker.rb

@@ -10,6 +10,7 @@ require_relative 'c_tanker/c_future'
 require_relative 'c_tanker/c_verification'
 require_relative 'c_tanker/c_verification_method'
 require_relative 'c_tanker/c_log_record'
+require_relative 'c_tanker/fork_hook'
 
 module Tanker
   module CTanker
@@ -98,6 +99,8 @@ module Tanker
 
     blocking_attach_function :tanker_before_fork, [], :void
     blocking_attach_function :tanker_after_fork, [], :void
+
+    ForkHook.install
   end
 
   private_constant :CTanker

data/lib/tanker/core/http.rb

@@ -85,7 +85,6 @@ module Tanker
       @queue = nil
 
       def self.init
-        puts "### PID=#{Process.pid} TANKER-CORE HTTP THREADPOOL INIT"
         # Queue is a concurrent queue in Ruby
         @queue = Queue.new
         @http_thread_pool = THREAD_POOL_SIZE.times do
@@ -96,7 +95,6 @@ module Tanker
       end
 
       def self.thread_loop
-        puts "### PID=#{Process.pid} TANKER-CORE HTTP THREADPOOL WORKER LOOP STARTED"
         loop do
           work = @queue.pop
           work.call
@@ -104,16 +102,27 @@ module Tanker
       end
 
       def self.push(proc)
-        puts "### PID=#{Process.pid} TANKER-CORE HTTP THREADPOOL PUSH"
         init if @queue.nil?
         @queue << proc
       end
 
       def self.before_fork
-        puts "### PID=#{Process.pid} TANKER-CORE HTTP THREADPOOL BEFORE FORK"
         @http_thread_pool = nil
         @queue = nil
       end
+
+      module ForkHook
+        def _fork(*args)
+          ThreadPool.before_fork
+          super
+        end
+
+        def self.install
+          Process.singleton_class.prepend(self)
+        end
+      end
+
+      ForkHook.install
     end
 
     class Client
@@ -183,7 +192,6 @@ module Tanker
       end
 
       def send_request(crequest, _cdata)
-        puts "### PID=#{Process.pid} TANKER-CORE HTTP SEND_REQUEST CALLED"
         request = HttpRequest.new(crequest:)
         ThreadPool.push(proc do
           process_request request

data/lib/tanker/core/init.rb

@@ -6,6 +6,10 @@ module Tanker
     @log_handler_lock = Mutex.new
     @log_handler_set = 0
 
+    def self.before_fork
+      @log_handler_set = 0
+    end
+
     def self.test_and_set_log_handler
       @log_handler_lock.synchronize do
         is_set = @log_handler_set
@@ -23,8 +27,6 @@ module Tanker
     end
 
     def initialize(options)
-      puts "### PID=#{Process.pid} TANKER-CORE initialize, about to call CTanker.tanker_init"
-
       # tanker_init is not called globally to avoid potential logs at global scope
       # some frameworks like to pre-execute statements at global scope and then fork, this fork can
       # interact badly with the threads used in the log handler, so never call Tanker at global scope

data/lib/tanker/core/version.rb

@@ -2,7 +2,7 @@
 
 module Tanker
   class Core
-    VERSION = '4.2.1.alpha.8'
+    VERSION = '4.2.1.alpha.10'
 
     def self.native_version
       CTanker.tanker_version_string

data/lib/tanker/core.rb

@@ -17,4 +17,3 @@ require_relative 'core/encryption_session'
 require_relative 'core/log_record'
 require_relative 'core/attach_result'
 require_relative 'core/init'
-require 'tanker/c_tanker/fork_hook'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 4.2.1.alpha.8
+  version: 4.2.1.alpha.10
 platform: ruby
 authors:
 - Tanker team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-16 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday