diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-02-21 09:50:19 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-02-21 09:50:19 -0500 |
| commit | b1867c85fa934caad1cd7410e1bd9bc0463a2f42 (patch) | |
| tree | 5c325634a2a07d4e86cd3b6858fd29651c8f91a9 /railties/lib/rails | |
| parent | c93c558aa81721653dd18cdc45f3f7299dfa8a72 (diff) | |
| download | rails-b1867c85fa934caad1cd7410e1bd9bc0463a2f42.tar.gz rails-b1867c85fa934caad1cd7410e1bd9bc0463a2f42.tar.bz2 rails-b1867c85fa934caad1cd7410e1bd9bc0463a2f42.zip | |
Revert "Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665."
This reverts commit e0a521cfcd13e4d1f0ae8ab96004289e1c020f71.
Conflicts:
railties/CHANGELOG.md
We expect loggers to quack like stdlib logger. If log4r needs different
level= assignment, using a Logger-quacking wrapper is the way to do it.
Fixes #14114.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application/bootstrap.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index 33bcab1e57..a26d41c0cf 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -53,11 +53,7 @@ INFO logger end - if ::Logger === Rails.logger - Rails.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase) - else - Rails.logger.level = config.log_level - end + Rails.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase) end # Initialize cache early in the stack so railties can make use of it. |