puma 3.9.1 → 3.10.0

data/lib/puma/minissl.rb

@@ -96,35 +96,29 @@ module Puma
         @socket.flush
       end
 
-      def close
-        begin
-          # Try to setup (so that we can then close them) any
-          # partially initialized sockets.
-          while @engine.init?
-            # Don't let this socket hold this loop forever.
-            # If it can't send more packets within 1s, then
-            # give up.
-            return unless IO.select([@socket], nil, nil, 1)
-            begin
-              read_nonblock(1024)
-            rescue Errno::EAGAIN
-            end
-          end
-
-          done = @engine.shutdown
-
-          while true
-            enc = @engine.extract
-            @socket.write enc
-
-            notify = @socket.sysread(1024)
+      def read_and_drop(timeout = 1)
+        return :timeout unless IO.select([@socket], nil, nil, timeout)
+        read_nonblock(1024)
+        :drop
+      rescue Errno::EAGAIN
+        # do nothing
+        :eagain
+      end
 
-            @engine.inject notify
-            done = @engine.shutdown
+      def should_drop_bytes?
+        @engine.init? || !@engine.shutdown
+      end
 
-            break if done
+      def close
+        begin
+          # Read any drop any partially initialized sockets and any received bytes during shutdown.
+          # Don't let this socket hold this loop forever.
+          # If it can't send more packets within 1s, then give up.
+          while should_drop_bytes?
+            return if read_and_drop(1) == :timeout
           end
         rescue IOError, SystemCallError
+          Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
           # nothing
         ensure
           @socket.close

data/lib/puma/plugin/tmp_restart.rb

@@ -32,4 +32,3 @@ Puma::Plugin.create do
     end
   end
 end
-

data/lib/puma/reactor.rb

@@ -28,6 +28,7 @@ module Puma
         begin
           ready = IO.select sockets, nil, nil, @sleep_for
         rescue IOError => e
+          Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
           if sockets.any? { |socket| socket.closed? }
             STDERR.puts "Error in select: #{e.message} (#{e.class})"
             STDERR.puts e.backtrace
@@ -195,6 +196,7 @@ module Puma
       begin
         @trigger << "c"
       rescue IOError
+        Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
       end
     end
 
@@ -202,6 +204,7 @@ module Puma
       begin
         @trigger << "!"
       rescue IOError
+        Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
       end
 
       @thread.join

data/lib/puma/server.rb

@@ -64,12 +64,11 @@ module Puma
       @thread_pool = nil
 
       @persistent_timeout = options.fetch(:persistent_timeout, PERSISTENT_TIMEOUT)
+      @first_data_timeout = options.fetch(:first_data_timeout, FIRST_DATA_TIMEOUT)
 
       @binder = Binder.new(events)
       @own_binder = true
 
-      @first_data_timeout = FIRST_DATA_TIMEOUT
-
       @leak_stack_on_error = true
 
       @options = options
@@ -111,6 +110,7 @@ module Puma
         begin
           socket.setsockopt(6, 3, 1) if socket.kind_of? TCPSocket
         rescue IOError, SystemCallError
+          Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
         end
       end
 
@@ -118,6 +118,7 @@ module Puma
         begin
           socket.setsockopt(6, 3, 0) if socket.kind_of? TCPSocket
         rescue IOError, SystemCallError
+          Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
         end
       end
 
@@ -128,6 +129,7 @@ module Puma
         begin
           tcp_info = socket.getsockopt(Socket::SOL_TCP, Socket::TCP_INFO)
         rescue IOError, SystemCallError
+          Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
           @precheck_closing = false
           false
         else
@@ -491,6 +493,7 @@ module Puma
         begin
           client.close if close_socket
         rescue IOError, SystemCallError
+          Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
           # Already closed
         rescue StandardError => e
           @events.unknown_error self, e, "Client"
@@ -893,35 +896,38 @@ module Puma
       end
     end
 
-    # Stops the acceptor thread and then causes the worker threads to finish
-    # off the request queue before finally exiting.
-    #
-    def stop(sync=false)
+    def notify_safely(message)
       begin
-        @notify << STOP_COMMAND
+        @notify << message
       rescue IOError
-        # The server, in another thread, is shutting down
+         # The server, in another thread, is shutting down
+        Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
+      rescue RuntimeError => e
+        # Temporary workaround for https://bugs.ruby-lang.org/issues/13239
+        if e.message.include?('IOError')
+          Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
+        else
+          raise e
+        end
       end
+    end
+    private :notify_safely
 
+    # Stops the acceptor thread and then causes the worker threads to finish
+    # off the request queue before finally exiting.
+
+    def stop(sync=false)
+      notify_safely(STOP_COMMAND)
       @thread.join if @thread && sync
     end
 
     def halt(sync=false)
-      begin
-        @notify << HALT_COMMAND
-      rescue IOError
-        # The server, in another thread, is shutting down
-      end
-
+      notify_safely(HALT_COMMAND)
       @thread.join if @thread && sync
     end
 
     def begin_restart
-      begin
-        @notify << RESTART_COMMAND
-      rescue IOError
-        # The server, in another thread, is shutting down
-      end
+      notify_safely(RESTART_COMMAND)
     end
 
     def fast_write(io, str)

data/lib/puma/thread_pool.rb

@@ -71,9 +71,9 @@ module Puma
     def spawn_thread
       @spawned += 1
 
-      th = Thread.new do
+      th = Thread.new(@spawned) do |spawned|
         # Thread name is new in Ruby 2.3
-        Thread.current.name = 'puma %03i' % @spawned if Thread.current.respond_to?(:name=)
+        Thread.current.name = 'puma %03i' % spawned if Thread.current.respond_to?(:name=)
         todo  = @todo
         block = @block
         mutex = @mutex

data/lib/rack/handler/puma.rb

@@ -84,6 +84,8 @@ module Rack
       end
     private
       def self.set_host_port_to_config(host, port, config)
+        config.clear_binds! if host || port
+
         if host && (host[0,1] == '.' || host[0,1] == '/')
           config.bind "unix://#{host}"
         elsif host && host =~ /^ssl:\/\//

data/tools/jungle/README.md

@@ -7,3 +7,7 @@ See `/tools/jungle/init.d` for tools to use with init.d and start-stop-daemon.
 ## Upstart
 
 See `/tools/jungle/upstart` for Ubuntu's upstart scripts.
+
+## Systemd
+
+See [/docs/systemd](https://github.com/puma/puma/blob/master/docs/systemd.md).

data/tools/trickletest.rb

@@ -31,7 +31,7 @@ st = "GET / HTTP/1.1\r\nHost: www.zedshaw.com\r\nContent-Type: text/plain\r\nCon
 puts "length: #{content.length}"
 
 threads = []
-ARGV[1].to_i.times do 
+ARGV[1].to_i.times do
   t = Thread.new do
     size = 100
     puts ">>>> #{size} sized chunks"

metadata

@@ -1,47 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.10.0
 platform: ruby
 authors:
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.15'
+date: 2017-08-17 00:00:00.000000000 Z
+dependencies: []
 description: Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server
   for Ruby/Rack applications. Puma is intended for use in both development and production
-  environments. In order to get the best throughput, it is highly recommended that
-  you use a  Ruby implementation with real threads like Rubinius or JRuby.
+  environments. It's great for highly concurrent Ruby implementations such as Rubinius
+  and JRuby as well as as providing process worker support to support CRuby well.
 email:
 - evan@phx.io
 executables:
@@ -49,33 +21,17 @@ executables:
 - pumactl
 extensions:
 - ext/puma_http11/extconf.rb
-extra_rdoc_files:
-- ".github/issue_template.md"
-- DEPLOYMENT.md
-- History.md
-- Manifest.txt
-- README.md
-- Release.md
-- docs/nginx.md
-- docs/signals.md
-- docs/systemd.md
-- tools/jungle/README.md
-- tools/jungle/init.d/README.md
-- tools/jungle/upstart/README.md
+extra_rdoc_files: []
 files:
-- ".github/issue_template.md"
-- DEPLOYMENT.md
-- Gemfile
 - History.md
 - LICENSE
-- Manifest.txt
 - README.md
-- Rakefile
-- Release.md
 - bin/puma
 - bin/puma-wild
 - bin/pumactl
 - docs/nginx.md
+- docs/plugins.md
+- docs/restart.md
 - docs/signals.md
 - docs/systemd.md
 - ext/puma_http11/PumaHttp11Service.java
@@ -92,7 +48,6 @@ files:
 - ext/puma_http11/org/jruby/puma/Http11Parser.java
 - ext/puma_http11/org/jruby/puma/MiniSSL.java
 - ext/puma_http11/puma_http11.c
-- gemfiles/2.1-Gemfile
 - lib/puma.rb
 - lib/puma/accept_nonblock.rb
 - lib/puma/app/status.rb
@@ -132,7 +87,6 @@ files:
 - lib/puma/thread_pool.rb
 - lib/puma/util.rb
 - lib/rack/handler/puma.rb
-- puma.gemspec
 - tools/jungle/README.md
 - tools/jungle/init.d/README.md
 - tools/jungle/init.d/puma
@@ -146,9 +100,7 @@ licenses:
 - BSD-3-Clause
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/.github/issue_template.md

@@ -1,20 +0,0 @@
-### Steps to reproduce
-
-1) ...
-
-2) ...
-
-3) ...
-
-### Expected behavior
-
-Tell us what should happen ...
-
-### Actual behavior
-
-Tell us what happens instead ...
-
-### System configuration
-
-**Ruby version**:
-**Rails version**:

data/DEPLOYMENT.md

@@ -1,91 +0,0 @@
-# Deployment engineering for puma
-
-Puma is software that is expected to be run in a deployed environment eventually.
-You can certainly use it as your dev server only, but most people look to use
-it in their production deployments as well.
-
-To that end, this is meant to serve as a foundation of wisdom how to do that
-in a way that increases happiness and decreases downtime.
-
-## Specifying puma
-
-Most people want to do this by putting `gem "puma"` into their Gemfile, so we'll
-go ahead and assume that. Go add it now... we'll wait.
-
-
-Welcome back!
-
-## Single vs Cluster mode
-
-Puma was originally conceived as a thread-only webserver, but grew the ability to
-also use processes in version 2.
-
-Here are some rules of thumb:
-
-### MRI
-
-* Use cluster mode and set the number of workers to 1.5x the number of cpu cores
-  in the machine, minimum 2.
-* Set the number of threads to desired concurrent requests / number of workers.
-  Puma defaults to 16 and that's a decent number.
-
-#### Migrating from Unicorn
-
-* If you're migrating from unicorn though, here are some settings to start with:
-  * Set workers to half the number of unicorn workers you're using
-  * Set threads to 2
-  * Enjoy 50% memory savings
-* As you grow more confident in the thread safety of your app, you can tune the
-  workers down and the threads up.
-
-#### Worker utilization
-
-**How do you know if you're got enough (or too many workers)?**
-
-A good question. Due to MRI's GIL, only one thread can be executing Ruby code at a time.
-But since so many apps are waiting on IO from DBs, etc., they can utilize threads
-to make better use of the process.
-
-The rule of thumb is you never want processes that are pegged all the time. This
-means that there is more work to do that the process can get through. On the other
-hand, if you have processes that sit around doing nothing, then they're just eating
-up resources.
-
-Watching your CPU utilization over time and aim for about 70% on average. This means
-you've got capacity still but aren't starving threads.
-
-## Daemonizing
-
-I prefer to not daemonize my servers and use something like `runit` or `upstart` to
-monitor them as child processes. This gives them fast response to crashes and
-makes it easy to figure out what is going on. Additionally, unlike `unicorn`,
-puma does not require daemonization to do zero-downtime restarts.
-
-I see people using daemonization because they start puma directly via capistrano
-task and thus want it to live on past the `cap deploy`. To this people I said:
-You need to be using a process monitor. Nothing is making sure puma stays up in
-this scenario! You're just waiting for something weird to happen, puma to die,
-and to get paged at 3am. Do yourself a favor, at least the process monitoring
-your OS comes with, be it `sysvinit`, `upstart`, or `systemd`. Or branch out
-and use `runit` or hell, even `monit`.
-
-## Restarting
-
-You probably will want to deploy some new code at some point, and you'd like
-puma to start running that new code. Minimizing the amount of time the server
-is unavailable would be nice as well. Here's how to do it:
-
-1. Don't use `preload!`. This dirties the master process and means it will have
-to shutdown all the workers and re-exec itself to get your new code. It is not compatible with phased-restart and `prune_bundler` as well.
-
-1. Use `prune_bundler`. This makes it so that the cluster master will detach itself
-from a Bundler context on start. This allows the cluster workers to load your app
-and start a brand new Bundler context within the worker only. This means your
-master remains pristine and can live on between new releases of your code.
-
-1. Use phased-restart (`SIGUSR1` or `pumactl phased-restart`). This tells the master
-to kill off one worker at a time and restart them in your new code. This minimizes
-downtime and staggers the restart nicely. **WARNING** This means that both your
-old code and your new code will be running concurrently. Most deployment solutions
-already cause that, but it's worth warning you about it again. Be careful with your
-migrations, etc!