puma 4.1.0-java → 4.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dac51ad5fcb659c08fb2bf59c206b7805e9853d348783414a260c0ccbe01ed5
-  data.tar.gz: 62abcd5a97888b7c2e8c236987588138217f024a6471410156f7077cc920f839
+  metadata.gz: d014c9b6cd9b7b4270a8fba7b5a23408f7a58aa010d9296f612bb740974a5c72
+  data.tar.gz: 725c17b258b7063bbbcd2ff1d35172258a853d013762541f35ab6af1882cc4c5
 SHA512:
-  metadata.gz: 3b5adbfb751509e3bbed09ba4946e4ba3fb71341cbdae78b79c8cabce89446b31af37609ea910295c6ffe3827fc6cfcf367028cb7614a9e89211396f52d3f07e
-  data.tar.gz: ad02001dd4a0e596209ab4a2238b7b6e9e2ca35c21926d30346c5c40669264b8e2647bfff7c5cf1b06924b13ba1cc002e5e7a62d799921f0e838c6ccf14e4324
+  metadata.gz: e81361dacd7dda921308c80868ccaa4c7f5788a16e779b73c9efef941f6df18429dac9fe9b98b38790b9e8e4988ad16caddb0702c706e2286e03d5c49602baf9
+  data.tar.gz: e16c1233ab6eb6b45a1c0dc2d6c16bfc47a5e0784014e0e862f7b1e054b881247e0ce9d36e2a855d47ee6bc3629262fc3cfc28f55b3f8d05297aab228e2a2280

data/History.md

@@ -6,6 +6,13 @@
 * Bugfixes
   * Your bugfix goes here (#Github Number)
 
+## 4.1.1 / 2019-09-05
+
+* 3 bugfixes
+  * Revert our attempt to not dup STDOUT/STDERR (#1946)
+  * Fix socket close on error (#1941)
+  * Fix workers not shutting down correctly (#1908)
+
 ## 4.1.0 / 2019-08-08
 
 * 4 features 

data/lib/puma/accept_nonblock.rb

@@ -15,7 +15,11 @@ module OpenSSL
             ssl.accept if @start_immediately
             ssl
           rescue SSLError => ex
-            sock.close
+            if ssl
+              ssl.close
+            else
+              sock.close
+            end
             raise ex
           end
         end

data/lib/puma/cluster.rb

@@ -35,34 +35,10 @@ module Puma
       @workers.each { |x| x.term }
 
       begin
-        if RUBY_VERSION < '2.6'
-          @workers.each do |w|
-            begin
-              Process.waitpid(w.pid)
-            rescue Errno::ECHILD
-              # child is already terminated
-            end
-          end
-        else
-          # below code is for a bug in Ruby 2.6+, above waitpid call hangs
-          t_st = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          pids = @workers.map(&:pid)
-          loop do
-            pids.reject! do |w_pid|
-              begin
-                if Process.waitpid(w_pid, Process::WNOHANG)
-                  log "    worker status: #{$?}"
-                  true
-                end
-              rescue Errno::ECHILD
-                true # child is already terminated
-              end
-            end
-            break if pids.empty?
-            sleep 0.5
-          end
-          t_end = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          log format("    worker shutdown time: %6.2f", t_end - t_st)
+        loop do
+          wait_workers
+          break if @workers.empty?
+          sleep 0.2
         end
       rescue Interrupt
         log "! Cancelled waiting for workers"
@@ -99,6 +75,7 @@ module Puma
         @last_checkin = Time.now
         @last_status = '{}'
         @dead = false
+        @term = false
       end
 
       attr_reader :index, :pid, :phase, :signal, :last_checkin, :last_status, :started_at
@@ -120,6 +97,10 @@ module Puma
         @dead = true
       end
 
+      def term?
+        @term
+      end
+
       def ping!(status)
         @last_checkin = Time.now
         @last_status = status
@@ -134,9 +115,9 @@ module Puma
           if @first_term_sent && (Time.now - @first_term_sent) > @options[:worker_shutdown_timeout]
             @signal = "KILL"
           else
+            @term ||= true
             @first_term_sent ||= Time.now
           end
-
           Process.kill @signal, @pid
         rescue Errno::ESRCH
         end
@@ -227,12 +208,7 @@ module Puma
       # during this loop by giving the kernel time to kill them.
       sleep 1 if any
 
-      pids = []
-      while pid = Process.waitpid(-1, Process::WNOHANG) do
-        pids << pid
-      end
-      @workers.reject! { |w| w.dead? || pids.include?(w.pid) }
-
+      wait_workers
       cull_workers
       spawn_workers
 
@@ -554,5 +530,24 @@ module Puma
         @wakeup.close
       end
     end
+
+    private
+
+    # loops thru @workers, removing workers that exited, and calling
+    # `#term` if needed
+    def wait_workers
+      @workers.reject! do |w|
+        begin
+          if Process.wait(w.pid, Process::WNOHANG)
+            true
+          else
+            w.term if w.term?
+            nil
+          end
+        rescue Errno::ECHILD
+          true # child is already terminated
+        end
+      end
+    end
   end
 end

data/lib/puma/const.rb

@@ -100,7 +100,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "4.1.0".freeze
+    PUMA_VERSION = VERSION = "4.1.1".freeze
     CODE_NAME = "Fourth and One".freeze
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
 

data/lib/puma/events.rb

@@ -29,8 +29,8 @@ module Puma
     #
     def initialize(stdout, stderr)
       @formatter = DefaultFormatter.new
-      @stdout = stdout.dup
-      @stderr = stderr.dup
+      @stdout = stdout
+      @stderr = stderr
 
       @stdout.sync = true
       @stderr.sync = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: java
 authors:
 - Evan Phoenix
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.0.4
 signing_key:
 specification_version: 4
 summary: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for