Remove deprecation warning when log_level is not explicit set on production

3 files changed, 1 insertions, 53 deletions

diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 71d3febde4..0f4d932749 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -1,6 +1,5 @@
 require "active_support/notifications"
 require "active_support/dependencies"
-require "active_support/deprecation"
 require "active_support/descendants_tracker"
 
 module Rails
@@ -55,18 +54,6 @@ INFO
           logger
         end
 
-        if Rails.env.production? && !config.has_explicit_log_level?
-          ActiveSupport::Deprecation.warn \
-           "You did not specify a `log_level` in `production.rb`. Currently, " \
-           "the default value for `log_level` is `:info` for the production " \
-           "environment and `:debug` in all other environments. In Rails 5 " \
-           "the default value will be unified to `:debug` across all " \
-           "environments. To preserve the current setting, add the following " \
-           "line to your `production.rb`:\n" \
-           "\n" \
-           "   config.log_level = :info\n\n"
-        end
-
         Rails.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase)
       end
 
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index fdc741dd08..3bb9a956c3 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -17,6 +17,7 @@ module Rails
                     :time_zone, :reload_classes_only_on_change,
                     :beginning_of_week, :filter_redirect, :x
 
+      attr_writer :log_level
       attr_reader :encoding
 
       def initialize(*)
@@ -35,7 +36,6 @@ module Rails
         @session_options               = {}
         @time_zone                     = "UTC"
         @beginning_of_week             = :monday
-        @has_explicit_log_level        = false
         @log_level                     = nil
         @middleware                    = app_middleware
         @generators                    = app_generators
@@ -119,15 +119,6 @@ module Rails
         raise e, "Cannot load `Rails.application.database_configuration`:\n#{e.message}", e.backtrace
       end
 
-      def has_explicit_log_level? # :nodoc:
-        @has_explicit_log_level
-      end
-
-      def log_level=(level)
-        @has_explicit_log_level = !!(level)
-        @log_level = level
-      end
-
       def log_level
         @log_level ||= (Rails.env.production? ? :info : :debug)
       end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index ad15e30b6a..b3995c9a6f 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -1062,36 +1062,6 @@ module ApplicationTests
       end
     end
 
-    test "Blank config.log_level is not deprecated for non-production environment" do
-      with_rails_env "development" do
-        assert_not_deprecated do
-          make_basic_app do |application|
-            application.config.log_level = nil
-          end
-        end
-      end
-    end
-
-    test "Blank config.log_level is deprecated for the production environment" do
-      with_rails_env "production" do
-        assert_deprecated(/log_level/) do
-          make_basic_app do |application|
-            application.config.log_level = nil
-          end
-        end
-      end
-    end
-
-    test "Not blank config.log_level is not deprecated for the production environment" do
-      with_rails_env "production" do
-        assert_not_deprecated do
-          make_basic_app do |application|
-            application.config.log_level = :info
-          end
-        end
-      end
-    end
-
     test "config.log_level with custom logger" do
       make_basic_app do |application|
         application.config.logger = Logger.new(STDOUT)