Skip to content

Commit

Permalink
remove setting quiet requests inside puma rack handler (#2075)
Browse files Browse the repository at this point in the history
* remove setting quiet requests inside puma rack handler

* added test cases for user and file config of log_requests

* update test cases to use example files

Co-authored-by: Nate Berkopec <nate.berkopec@gmail.com>
  • Loading branch information
jchristie55332 and nateberkopec committed Feb 19, 2020
1 parent 8c9b3eb commit 5b8f557
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
1 change: 1 addition & 0 deletions History.md
Expand Up @@ -3,6 +3,7 @@
* Features
* Add pumactl `thread-backtraces` command to print thread backtraces (#2053)
* Configuration: `environment` is read from `RAILS_ENV`, if `RACK_ENV` can't be found (#2022)
* Do not set user_config to quiet by default to allow for file config (#2074)
* `Puma.stats` now returns a Hash instead of a JSON string (#2086)
* `GC.compact` is called before fork if available (#2093)
* Add `requests_count` to workers stats. (#2106)
Expand Down
2 changes: 0 additions & 2 deletions lib/rack/handler/puma.rb
Expand Up @@ -30,8 +30,6 @@ def self.config(app, options = {})
end

conf = ::Puma::Configuration.new(options, default_options) do |user_config, file_config, default_config|
user_config.quiet

if options.delete(:Verbose)
app = Rack::CommonLogger.new(app, STDOUT)
end
Expand Down
29 changes: 29 additions & 0 deletions test/test_rack_handler.rb
Expand Up @@ -226,4 +226,33 @@ def test_user_port_wins_over_config
end
end
end

def test_file_log_requests_wins_over_default_config
file_log_requests_config = true

@options[:config_files] = [
'test/shell/t1_conf.rb'
]

conf = Rack::Handler::Puma.config(->{}, @options)
conf.load

assert_equal file_log_requests_config, conf.options[:log_requests]
end


def test_user_log_requests_wins_over_file_config
file_log_requests_config = true
user_log_requests_config = false

@options[:log_requests] = user_log_requests_config
@options[:config_files] = [
'test/shell/t1_conf.rb'
]

conf = Rack::Handler::Puma.config(->{}, @options)
conf.load

assert_equal user_log_requests_config, conf.options[:log_requests]
end
end

0 comments on commit 5b8f557

Please sign in to comment.