From 65a821aa7eabaddd3039067cd2b51cdd85346dba Mon Sep 17 00:00:00 2001 From: Nate Berkopec Date: Tue, 14 Dec 2021 14:38:28 -0700 Subject: [PATCH] Revert "Add ability to specify custom logger (#2725)" (#2769) This reverts commit 9cf89e6971eed5351c82b6d45bf81ae4aa0dd6da. --- lib/puma/dsl.rb | 5 ----- test/config/custom_logger.rb | 13 ------------- test/test_config.rb | 3 +++ 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 test/config/custom_logger.rb diff --git a/lib/puma/dsl.rb b/lib/puma/dsl.rb index 21f3818c..308a9687 100644 --- a/lib/puma/dsl.rb +++ b/lib/puma/dsl.rb @@ -365,11 +365,6 @@ module Puma @options[:log_requests] = which end - # Pass in a custom logging class instance - def logger(custom_logger) - @options[:logger] = custom_logger - end - # Show debugging info # def debug diff --git a/test/config/custom_logger.rb b/test/config/custom_logger.rb deleted file mode 100644 index 0794625f..00000000 --- a/test/config/custom_logger.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CustomLogger - def initialize(output=STDOUT) - @output = output - end - - def write(msg) - @output.print 'Custom logging: ' + msg - @output.flush - end -end - -log_requests -logger CustomLogger.new(STDOUT) diff --git a/test/test_config.rb b/test/test_config.rb index 73676bf4..e4d01c07 100644 --- a/test/test_config.rb +++ b/test/test_config.rb @@ -121,6 +121,9 @@ class TestConfigFile < TestConfigFileBase assert_equal [ssl_binding], conf.options[:binds] end + + + def test_ssl_bind_no_tlsv1_1 skip_if :jruby skip_unless :ssl