diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-08-23 00:28:32 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-08-23 00:28:32 +0930 |
| commit | 2602a49a8600ab52f807599bbd5b1f9c0be4214f (patch) | |
| tree | 40c8c103304c0e8ef11dde1ef5108142aa0d179b | |
| parent | 5d7c1057684c377bc2801c8851e99ff11ab23530 (diff) | |
| parent | 523e27979291792379c403a0f19d10c41825dd09 (diff) | |
| download | rails-2602a49a8600ab52f807599bbd5b1f9c0be4214f.tar.gz rails-2602a49a8600ab52f807599bbd5b1f9c0be4214f.tar.bz2 rails-2602a49a8600ab52f807599bbd5b1f9c0be4214f.zip | |
Merge pull request #16622 from matthewd/default-debug
Don't fight against ourselves for the default log level
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 9a6a4a52c7..2c16b83f8a 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -117,7 +117,7 @@ module Rails end def log_level - @log_level ||= Rails.env.production? ? :info : :debug + @log_level ||= :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 bbfd9505bc..2cd8040f35 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 @@ -44,8 +44,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 - # Set to :info to decrease the log volume. - config.log_level = :debug + # Decrease the log volume. + # config.log_level = :info # Prepend all log lines with the following tags. # config.log_tags = [ :subdomain, :uuid ] |