pitchfork 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dc129b2e6e6e940be0f9e388400a376614a65a125a64b68c73b919744c433b3
-  data.tar.gz: b12e1d5f360edc7159567060c095b40510e8e89c54dae058882742c29c830f78
+  metadata.gz: 7bf3d38329b727807923b9d57bfa09f686e313e30b374542f703b9b27f8f6afb
+  data.tar.gz: b47932131e9873ac74617d9cabdd99d2d7c948dcd03564a544b51bd0449ad54c
 SHA512:
-  metadata.gz: 4a43b0204dc0e77a4d28007dbfd89e9645724a4198ea6ec7ffa0895aefaf075bd42d4303c37d0f7e61afb550b665b78ab6b22ca9f934ef2d3721883acf0a68cd
-  data.tar.gz: 7eb41807d6971ac948ee264b1f70fd2e16afcf8f289655073c876b752a53a405b9705e97509f5be82c519ee12694ecf1910b18a20cce8aad3ce9a4ffd3af9ac6
+  metadata.gz: d44f02f6db020cb66ccf17e7221bf86fbec3da47f2ddb9a3d00da5a857472e512f490b02e60f8394a95b595074ab86aa33f2d0822dab45f60090fc355a97bee9
+  data.tar.gz: 868ae5172e8bcee925528a12d3d332c40fb88fd2d6ca1394273ddb5cbe1fde92b0e17ace1abd3681620abffb325a381d6c6622885cdf21f965ade000180bc890

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Unreleased
 
+# 0.12.0
+
+- Disable IO tracking on Rubies older than 3.2.3 to avoid running into https://bugs.ruby-lang.org/issues/19531.
+  This Ruby bug can lead to memory corruption that cause VM crashes when calling various IO methods.
+- Implement `rack.response_finished` (#97).
+- Don't break the `rack.after_reply` callback chain if one callback raises (#97).
+
 # 0.11.1
 
 - Fix Ruby 3.4-dev compatibility.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pitchfork (0.11.1)
+    pitchfork (0.12.0)
       rack (>= 2.0)
       raindrops (~> 0.7)
 

data/lib/pitchfork/http_server.rb

@@ -732,7 +732,7 @@ module Pitchfork
         end
       end
 
-      env["rack.after_reply"] = []
+      env["rack.response_finished"] = env["rack.after_reply"] = []
 
       status, headers, body = @app.call(env)
 
@@ -758,11 +758,21 @@ module Pitchfork
         client.close # flush and uncork socket immediately, no keepalive
       end
       env
-    rescue => e
-      handle_error(client, e)
+    rescue => application_error
+      handle_error(client, application_error)
       env
     ensure
-      env["rack.after_reply"].each(&:call) if env
+      if env
+        env["rack.response_finished"].each do |callback|
+          if callback.arity == 0
+            callback.call
+          else
+            callback.call(env, status, headers, application_error)
+          end
+        rescue => callback_error
+          Pitchfork.log_error(@logger, "rack.after_reply error", callback_error)
+        end
+      end
       timeout_handler.finished
       env
     end

data/lib/pitchfork/info.rb

@@ -4,9 +4,6 @@ require 'pitchfork/shared_memory'
 
 module Pitchfork
   module Info
-    @workers_count = 0
-    @fork_safe = true
-
     class WeakSet # :nodoc
       def initialize
         @map = ObjectSpace::WeakMap.new
@@ -27,42 +24,68 @@ module Pitchfork
       end
     end
 
-    @kept_ios = WeakSet.new
+    if RUBY_VERSION < "3.2.3" && RUBY_ENGINE == "ruby"
+      class << self
+        def keep_io(io)
+          io # noop
+        end
 
-    class << self
-      attr_accessor :workers_count
+        def keep_ios(ios)
+          ios # noop
+        end
 
-      def keep_io(io)
-        raise ArgumentError, "#{io.inspect} doesn't respond to :to_io" unless io.respond_to?(:to_io)
-        @kept_ios << io
-        io
-      end
+        def close_all_ios!
+          raise NoMethodError, <<~MSG
+            Your Ruby version is subject to a bug that prevent `.close_all_ios!` from working.
+            See: https://bugs.ruby-lang.org/issues/19531.
 
-      def keep_ios(ios)
-        ios.each { |io| keep_io(io) }
+            Consider upgrading to Ruby 3.2.3+
+          MSG
+        end
       end
+    else
+      @kept_ios = WeakSet.new
+
+      class << self
+        def keep_io(io)
+          raise ArgumentError, "#{io.inspect} doesn't respond to :to_io" unless io.respond_to?(:to_io)
+          @kept_ios << io
+          io
+        end
 
-      def close_all_ios!
-        ignored_ios = [$stdin, $stdout, $stderr, STDIN, STDOUT, STDERR].uniq.compact
-
-        @kept_ios.each do |io_like|
-          ignored_ios << (io_like.is_a?(IO) ? io_like : io_like.to_io)
+        def keep_ios(ios)
+          ios.each { |io| keep_io(io) }
         end
 
-        ObjectSpace.each_object(IO) do |io|
-          if io_open?(io) && io_autoclosed?(io) && !ignored_ios.include?(io)
-            if io.is_a?(TCPSocket)
-              # If we inherited a TCP Socket, calling #close directly could send FIN or RST.
-              # So we first reopen /dev/null to avoid that.
-              io.reopen(File::NULL)
-            end
-            begin
-              io.close
-            rescue Errno::EBADF
+        def close_all_ios!
+          ignored_ios = [$stdin, $stdout, $stderr, STDIN, STDOUT, STDERR].uniq.compact
+
+          @kept_ios.each do |io_like|
+            ignored_ios << (io_like.is_a?(IO) ? io_like : io_like.to_io)
+          end
+
+          ObjectSpace.each_object(IO) do |io|
+            if io_open?(io) && io_autoclosed?(io) && !ignored_ios.include?(io)
+              if io.is_a?(TCPSocket)
+                # If we inherited a TCP Socket, calling #close directly could send FIN or RST.
+                # So we first reopen /dev/null to avoid that.
+                io.reopen(File::NULL)
+              end
+              begin
+                io.close
+              rescue Errno::EBADF
+              end
             end
           end
         end
       end
+    end
+
+    @workers_count = 0
+    @fork_safe = true
+
+    class << self
+      attr_accessor :workers_count
 
       def fork_safe?
         @fork_safe

data/lib/pitchfork/message.rb

@@ -14,6 +14,7 @@ module Pitchfork
     FD = Struct.new(:index)
 
     def initialize(socket)
+      raise ArgumentError, "expected a socket, got: #{socket.inspect}" unless socket
       @socket = socket
     end
 

data/lib/pitchfork/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Pitchfork
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
   module Const
     UNICORN_VERSION = '6.1.0'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pitchfork
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raindrops