puma 6.4.3-java → 6.6.0-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (40) hide show
  1. checksums.yaml +4 -4
  2. data/History.md +139 -3
  3. data/README.md +81 -21
  4. data/docs/fork_worker.md +11 -1
  5. data/docs/java_options.md +54 -0
  6. data/docs/plugins.md +4 -0
  7. data/docs/signals.md +2 -2
  8. data/docs/stats.md +8 -3
  9. data/docs/systemd.md +10 -1
  10. data/ext/puma_http11/extconf.rb +19 -16
  11. data/ext/puma_http11/mini_ssl.c +11 -1
  12. data/ext/puma_http11/org/jruby/puma/Http11.java +28 -7
  13. data/ext/puma_http11/puma_http11.c +4 -1
  14. data/lib/puma/app/status.rb +1 -1
  15. data/lib/puma/binder.rb +12 -4
  16. data/lib/puma/cli.rb +9 -5
  17. data/lib/puma/client.rb +35 -12
  18. data/lib/puma/cluster/worker.rb +9 -6
  19. data/lib/puma/cluster/worker_handle.rb +4 -5
  20. data/lib/puma/cluster.rb +31 -19
  21. data/lib/puma/configuration.rb +36 -18
  22. data/lib/puma/const.rb +14 -3
  23. data/lib/puma/control_cli.rb +4 -4
  24. data/lib/puma/dsl.rb +282 -43
  25. data/lib/puma/error_logger.rb +4 -4
  26. data/lib/puma/jruby_restart.rb +0 -16
  27. data/lib/puma/launcher.rb +21 -8
  28. data/lib/puma/log_writer.rb +9 -9
  29. data/lib/puma/minissl/context_builder.rb +1 -0
  30. data/lib/puma/minissl.rb +1 -0
  31. data/lib/puma/null_io.rb +26 -0
  32. data/lib/puma/puma_http11.jar +0 -0
  33. data/lib/puma/request.rb +7 -3
  34. data/lib/puma/runner.rb +9 -2
  35. data/lib/puma/sd_notify.rb +1 -4
  36. data/lib/puma/server.rb +33 -22
  37. data/lib/puma/thread_pool.rb +14 -2
  38. data/lib/puma/util.rb +1 -1
  39. data/lib/rack/handler/puma.rb +8 -5
  40. metadata +9 -8
data/lib/puma/control_cli.rb CHANGED
@@ -37,7 +37,7 @@ module Puma
37
37
  # @version 5.0.0
38
38
  PRINTABLE_COMMANDS = %w[gc-stats stats thread-backtraces].freeze
39
39
 
40
- def initialize(argv, stdout=STDOUT, stderr=STDERR)
40
+ def initialize(argv, stdout=STDOUT, stderr=STDERR, env: ENV)
41
41
  @state = nil
42
42
  @quiet = false
43
43
  @pidfile = nil
@@ -46,7 +46,7 @@ module Puma
46
46
  @control_auth_token = nil
47
47
  @config_file = nil
48
48
  @command = nil
49
- @environment = ENV['APP_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV']
49
+ @environment = env['APP_ENV'] || env['RACK_ENV'] || env['RAILS_ENV']
50
50
 
51
51
  @argv = argv.dup
52
52
  @stdout = stdout
@@ -60,7 +60,7 @@ module Puma
60
60
  @state = arg
61
61
  end
62
62
 
63
- o.on "-Q", "--quiet", "Not display messages" do |arg|
63
+ o.on "-Q", "--quiet", "Do not display messages" do |arg|
64
64
  @quiet = true
65
65
  end
66
66
 
@@ -127,7 +127,7 @@ module Puma
127
127
  require_relative 'configuration'
128
128
  require_relative 'log_writer'
129
129
 
130
- config = Puma::Configuration.new({ config_files: [@config_file] }, {})
130
+ config = Puma::Configuration.new({ config_files: [@config_file] }, {} , env)
131
131
  config.load
132
132
  @state ||= config.options[:state]
133
133
  @control_url ||= config.options[:control_url]