puma 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fbb8e41c911f790de45695555dbbaaec62267a3ecbee2d77c63836d6b24fed8
-  data.tar.gz: 0c058d33c862cf274e7d4d6b57499da594d8c703a90b60cbd5b518a184193253
+  metadata.gz: 5288b12515ced761374a9789a16f4e0b66b6acdb94046d5d12b9999097224626
+  data.tar.gz: 5507be3e76794c32f7cce1e72291ce1fbc93eee8fc4986fa8a99b0aac0b7efbf
 SHA512:
-  metadata.gz: 75ba396a62ac7723aa196608650121491e1e44bfa472b5a17919b1efec0efcc219da2ebeec75092d19c883d2a1519993f7a251f5ff0e717a3e773d75974337f9
-  data.tar.gz: a333da0c47c27cfd18daacb49fb179defa5978a6c6ddb9144fb1dc56abfc021887e7a137c84da12e339afcb0636596cc1aa025b8181e98e2a45ca0fb26c6efe8
+  metadata.gz: f0f04bf4b3b75cab397783d89ad46031c023d8b1f90e6297085d542cb3e77ef5c7dc3a278f73b13e0e7490b9a4dee15b95f9548a58e69e4a9a67f35cc332f56b
+  data.tar.gz: b547445e6976b1cf58b221ac5810359e343ba0242b3ea58675b2f2be8367bba98c325c100f6a63766f6c02289f7763d6a93485484202895eed7f5e16c9a17753

data/History.md

@@ -6,6 +6,11 @@
 * Bugfixes
   * Your bugfix goes here <Most recent on the top, like GitHub> (#Github Number)
 
+## 5.0.2 / 2020-09-28
+
+* Bugfixes 
+  * Reverted API changes to Server.
+
 ## 5.0.1 / 2020-09-28
 
 * Bugfixes

data/lib/puma/const.rb

@@ -100,7 +100,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "5.0.1".freeze
+    PUMA_VERSION = VERSION = "5.0.2".freeze
     CODE_NAME = "Spoony Bard".freeze
 
     PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze

data/lib/puma/runner.rb

@@ -54,8 +54,9 @@ module Puma
 
       app = Puma::App::Status.new @launcher, token
 
-      control = Puma::Server.new app, @launcher.events,
-        { min_threads: 0, max_threads: 1 }
+      control = Puma::Server.new app, @launcher.events
+      control.min_threads = 0
+      control.max_threads = 1
 
       control.binder.parse [str], self, 'Starting control server'
 
@@ -68,7 +69,6 @@ module Puma
       @control.binder.close_listeners if @control
     end
 
-    # @!attribute [r] ruby_engine
     def ruby_engine
       if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
         "ruby #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
@@ -137,14 +137,27 @@ module Puma
       @launcher.binder.parse @options[:binds], self
     end
 
-    # @!attribute [r] app
     def app
       @app ||= @launcher.config.app
     end
 
     def start_server
+      min_t = @options[:min_threads]
+      max_t = @options[:max_threads]
+
       server = Puma::Server.new app, @launcher.events, @options
+      server.min_threads = min_t
+      server.max_threads = max_t
       server.inherit_binder @launcher.binder
+
+      if @options[:early_hints]
+        server.early_hints = true
+      end
+
+      unless development? || test?
+        server.leak_stack_on_error = false
+      end
+
       server
     end
   end

data/lib/puma/server.rb

@@ -34,21 +34,15 @@ module Puma
 
     attr_reader :thread
     attr_reader :events
-    attr_reader :min_threads, :max_threads  # for #stats
-    attr_reader :requests_count             # @version 5.0.0
-
-    # the following may be deprecated in the future
-    attr_reader :auto_trim_time
-    attr_reader :first_data_timeout
-    attr_reader :persistent_timeout
-    attr_reader :reaping_time
-
+    attr_reader :requests_count # @version 5.0.0
     attr_accessor :app
-    attr_accessor :binder
 
-    def_delegators :@binder, :add_tcp_listener, :add_ssl_listener, :add_unix_listener, :connected_ports
-
-    ThreadLocalKey = :puma_server
+    attr_accessor :min_threads
+    attr_accessor :max_threads
+    attr_accessor :persistent_timeout
+    attr_accessor :auto_trim_time
+    attr_accessor :reaping_time
+    attr_accessor :first_data_timeout
 
     # Create a server for the rack app +app+.
     #
@@ -58,10 +52,6 @@ module Puma
     # Server#run returns a thread that you can join on to wait for the server
     # to do its work.
     #
-    # @note Several instance variables exist so they are available for testing,
-    #   and have default values set via +fetch+.  Normally the values are set via
-    #   `::Puma::Configuration.puma_default_options`.
-    #
     def initialize(app, events=Events.stdio, options={})
       @app = app
       @events = events
@@ -69,24 +59,24 @@ module Puma
       @check, @notify = nil
       @status = :stop
 
+      @min_threads = 0
+      @max_threads = 16
       @auto_trim_time = 30
       @reaping_time = 1
 
       @thread = nil
       @thread_pool = nil
+      @early_hints = nil
 
-      @options = options
+      @persistent_timeout = options.fetch(:persistent_timeout, PERSISTENT_TIMEOUT)
+      @first_data_timeout = options.fetch(:first_data_timeout, FIRST_DATA_TIMEOUT)
 
-      @early_hints        = options.fetch :early_hints, nil
-      @first_data_timeout = options.fetch :first_data_timeout, FIRST_DATA_TIMEOUT
-      @min_threads        = options.fetch :min_threads, 0
-      @max_threads        = options.fetch :max_threads , (Puma.mri? ? 5 : 16)
-      @persistent_timeout = options.fetch :persistent_timeout, PERSISTENT_TIMEOUT
-      @queue_requests     = options.fetch :queue_requests, true
+      @binder = Binder.new(events)
 
-      @leak_stack_on_error = !!(@options[:environment] =~ /\A(development|test)\z/)
+      @leak_stack_on_error = true
 
-      @binder = Binder.new(events)
+      @options = options
+      @queue_requests = options[:queue_requests].nil? ? true : options[:queue_requests]
 
       ENV['RACK_ENV'] ||= "development"
 
@@ -99,16 +89,15 @@ module Puma
       @shutdown_mutex = Mutex.new
     end
 
+    attr_accessor :binder, :leak_stack_on_error, :early_hints
+
+    def_delegators :@binder, :add_tcp_listener, :add_ssl_listener, :add_unix_listener, :connected_ports
+
     def inherit_binder(bind)
       @binder = bind
     end
 
     class << self
-      # @!attribute [r] current
-      def current
-        Thread.current[ThreadLocalKey]
-      end
-
       # :nodoc:
       # @version 5.0.0
       def tcp_cork_supported?
@@ -183,12 +172,10 @@ module Puma
       end
     end
 
-    # @!attribute [r] backlog
     def backlog
       @thread_pool and @thread_pool.backlog
     end
 
-    # @!attribute [r] running
     def running
       @thread_pool and @thread_pool.spawned
     end
@@ -201,7 +188,6 @@ module Puma
     # there are 5 threads sitting idle ready to take
     # a request. If one request comes in, then the
     # value would be 4 until it finishes processing.
-    # @!attribute [r] pool_capacity
     def pool_capacity
       @thread_pool and @thread_pool.pool_capacity
     end
@@ -1012,6 +998,12 @@ module Puma
     end
     private :fast_write
 
+    ThreadLocalKey = :puma_server
+
+    def self.current
+      Thread.current[ThreadLocalKey]
+    end
+
     def shutting_down?
       @status == :stop || @status == :restart
     end
@@ -1027,7 +1019,6 @@ module Puma
 
     # Returns a hash of stats about the running server for reporting purposes.
     # @version 5.0.0
-    # @!attribute [r] stats
     def stats
       STAT_METHODS.map {|name| [name, send(name) || 0]}.to_h
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Evan Phoenix