add RAILS_MIN_THREADS, RAILS_MAX_THREADS, set default worker, preload…

History.md

@@ -13,7 +13,11 @@
 * Deprecations, Removals and Breaking API Changes
   * `Puma.stats` now returns a Hash instead of a JSON string (#2086)
   * `--control` has been removed. Use `--control-url` (#1487)
-  * `worker_directory` has been removed. Use `directory`.
+  * `worker_directory` has been removed. Use `directory`
+  * min_threads now set by environment variables PUMA_MIN_THREADS and MIN_THREADS
+  * max_threads now set by environment variables PUMA_MAX_THREADS and MAX_THREADS
+  * max_threads default to 5 in MRI or 16 for all other interpretters
+  * preload by default if workers > 1 and interpretter supports workers
   * `tcp_mode` has been removed without replacement. (#2169)
   * Daemonization has been removed without replacement. (#2170)
   * Changed #connected_port to #connected_ports (#2076)

lib/puma/configuration.rb

@@ -137,6 +137,12 @@ def initialize(user_options={}, default_options = {}, &block)
       @file_dsl    = DSL.new(@options.file_options, self)
       @default_dsl = DSL.new(@options.default_options, self)
 
+      workers_supported = !(Puma.jruby? || Puma.windows?)
+
+      if !@options[:prune_bundler]
+        default_options[:preload_app] = (@options[:workers] > 1) && workers_supported
+      end
+
       if block
         configure(&block)
       end
@@ -167,14 +173,20 @@ def flatten!
       self
     end
 
+    def default_max_threads
+      return 5 if Puma.mri?
+      16
+    end
+
     def puma_default_options
       {
-        :min_threads => 0,
-        :max_threads => 16,
+        :min_threads => Integer(ENV['PUMA_MIN_THREADS'] || ENV['MIN_THREADS'] || 0),
+        :max_threads => Integer(ENV['PUMA_MAX_THREADS'] || ENV['MAX_THREADS'] || default_max_threads),
         :log_requests => false,
         :debug => false,
         :binds => ["tcp://#{DefaultTCPHost}:#{DefaultTCPPort}"],
-        :workers => 0,
+        :workers => Integer(ENV['WEB_CONCURRENCY'] || 0),
+        :daemon => false,
         :mode => :http,
         :worker_timeout => DefaultWorkerTimeout,
         :worker_boot_timeout => DefaultWorkerTimeout,

lib/puma/detect.rb

@@ -12,4 +12,8 @@ def self.jruby?
   def self.windows?
     IS_WINDOWS
   end
+
+  def self.mri?
+    RUBY_ENGINE == 'ruby' || RUBY_ENGINE.nil?
+  end
 end

test/test_cli.rb

@@ -55,7 +55,8 @@ def test_control_for_tcp
     body = s.read
     s.close
 
-    assert_match(/{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":16,"max_threads":16,"requests_count":0}/, body.split(/\r?\n/).last)
+    dmt = Puma::Configuration.new.default_max_threads
+    assert_match(/{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":#{dmt},"max_threads":#{dmt},"requests_count":0}/, body.split(/\r?\n/).last)
 
   ensure
     cli.launcher.stop
@@ -89,7 +90,8 @@ def test_control_for_ssl
       body = http.request(req).body
     end
 
-    expected_stats = /{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":16,"max_threads":16,"requests_count":0}/
+    dmt = Puma::Configuration.new.default_max_threads
+    expected_stats = /{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":#{dmt},"max_threads":#{dmt}/
     assert_match(expected_stats, body.split(/\r?\n/).last)
     assert_equal([:started_at, :backlog, :running, :pool_capacity, :max_threads, :requests_count], Puma.stats.keys)
 
@@ -169,7 +171,8 @@ def test_control
     body = s.read
     s.close
 
-    assert_match(/{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":16,"max_threads":16,"requests_count":0}/, body.split("\r\n").last)
+    dmt = Puma::Configuration.new.default_max_threads
+    assert_match(/{"started_at":"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z","backlog":0,"running":0,"pool_capacity":#{dmt},"max_threads":#{dmt},"requests_count":0}/, body.split("\r\n").last)
   ensure
     if UNIX_SKT_EXIST
       cli.launcher.stop

test/test_config.rb

@@ -9,6 +9,58 @@
 class TestConfigFile < TestConfigFileBase
   parallelize_me!
 
+  def test_default_max_threads
+    max_threads = 16
+    max_threads = 5 if RUBY_ENGINE.nil? || RUBY_ENGINE == 'ruby'
+    assert_equal max_threads, Puma::Configuration.new.default_max_threads
+  end
+
+  def test_config_loads_correct_min_threads
+    conf = Puma::Configuration.new
+    assert_equal 0, conf.options.default_options[:min_threads]
+
+    ENV['MIN_THREADS'] = '7'
+    conf = Puma::Configuration.new
+    assert_equal 7, conf.options.default_options[:min_threads]
+
+    ENV['PUMA_MIN_THREADS'] = '8'
+    conf = Puma::Configuration.new
+    assert_equal 8, conf.options.default_options[:min_threads]
+  end
+
+  def test_config_loads_correct_max_threads
+    conf = Puma::Configuration.new
+    assert_equal conf.default_max_threads, conf.options.default_options[:max_threads]
+
+    ENV['MAX_THREADS'] = '7'
+    conf = Puma::Configuration.new
+    assert_equal 7, conf.options.default_options[:max_threads]
+
+    ENV['PUMA_MAX_THREADS'] = '8'
+    conf = Puma::Configuration.new
+    assert_equal 8, conf.options.default_options[:max_threads]
+  end
+
+  def test_config_loads_correct_workers
+    conf = Puma::Configuration.new
+    assert_equal 0, conf.options.default_options[:workers]
+
+    ENV['WEB_CONCURRENCY'] = '8'
+    conf = Puma::Configuration.new
+    assert_equal 8, conf.options.default_options[:workers]
+  end
+
+  def test_config_preloads_app_if_using_workers
+    ENV['WEB_CONCURRENCY'] = '0'
+    conf = Puma::Configuration.new
+    assert_equal false, conf.options.default_options[:preload_app]
+
+    ENV['WEB_CONCURRENCY'] = '2'
+    preload = Puma::Plugin.new.workers_supported?
+    conf = Puma::Configuration.new
+    assert_equal preload, conf.options.default_options[:preload_app]
+  end
+
   def test_app_from_rackup
     conf = Puma::Configuration.new do |c|
       c.rackup "test/rackup/hello-bind.ru"