remove setting quiet requests inside puma rack handler

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)
 
 * Bugfixes
   * Your bugfix goes here (#Github Number)

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

test/test_rack_handler.rb

@@ -226,4 +226,39 @@ def test_user_port_wins_over_config
       end
     end
   end
+
+  def test_file_log_requests_wins_over_deafult_config
+    file_log_requests_config = true
+
+    Dir.mktmpdir do |d|
+      Dir.chdir(d) do
+        FileUtils.mkdir("config")
+        File.open("config/puma.rb", "w") { |f| f << "log_requests #{file_log_requests_config}" }
+
+        conf = Rack::Handler::Puma.config(->{}, @options)
+        conf.load
+
+        assert_equal file_log_requests_config, conf.options[:log_requests]
+      end
+    end
+  end
+
+
+  def test_user_log_requests_wins_over_file_config
+    file_log_requests_config = true
+    user_log_requests_config = false
+
+    Dir.mktmpdir do |d|
+      Dir.chdir(d) do
+        FileUtils.mkdir("config")
+        File.open("config/puma.rb", "w") { |f| f << "log_requests #{file_log_requests_config}" }
+
+        @options[:log_requests] = user_log_requests_config
+        conf = Rack::Handler::Puma.config(->{}, @options)
+        conf.load
+
+        assert_equal user_log_requests_config, conf.options[:log_requests]
+      end
+    end
+  end
 end