aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2014-11-17 03:42:00 -0800
committerGodfrey Chan <godfreykfc@gmail.com>2014-11-17 03:42:00 -0800
commit402cc9f46acfd1ff172fdff5bc99f397d498607d (patch)
tree2f8561da455329b6e752d5c62b06d472278cea95
parent3a804aab9557efd1f1f3b68a5d1e9e3c2f37df20 (diff)
downloadrails-402cc9f46acfd1ff172fdff5bc99f397d498607d.tar.gz
rails-402cc9f46acfd1ff172fdff5bc99f397d498607d.tar.bz2
rails-402cc9f46acfd1ff172fdff5bc99f397d498607d.zip
Revert "Merge pull request #16622 from matthewd/default-debug"
This reverts commit 2602a49a8600ab52f807599bbd5b1f9c0be4214f, reversing changes made to 5d7c1057684c377bc2801c8851e99ff11ab23530. The explicit default was introduced in 21f6d72, so apps created with Rails < 4 have the commented out version, which means that this change would break those apps.
-rw-r--r--railties/lib/rails/application/configuration.rb2
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt4
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 786dcee007..8a5bce64a0 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -118,7 +118,7 @@ module Rails
end
def log_level
- @log_level ||= :debug
+ @log_level ||= Rails.env.production? ? :info : :debug
end
def colorize_logging
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 92ff0de030..aa7b93f0a1 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -45,8 +45,8 @@ Rails.application.configure do
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true
- # Decrease the log volume.
- # config.log_level = :info
+ # Set to :info to decrease the log volume.
+ config.log_level = :debug
# Prepend all log lines with the following tags.
# config.log_tags = [ :subdomain, :uuid ]