diff --git a/History.md b/History.md index 3d06bb008e..1d25a74b06 100644 --- a/History.md +++ b/History.md @@ -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) diff --git a/lib/rack/handler/puma.rb b/lib/rack/handler/puma.rb index e846f13cfb..ba25895592 100644 --- a/lib/rack/handler/puma.rb +++ b/lib/rack/handler/puma.rb @@ -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 diff --git a/test/test_rack_handler.rb b/test/test_rack_handler.rb index 81790804fc..223dc683d0 100644 --- a/test/test_rack_handler.rb +++ b/test/test_rack_handler.rb @@ -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