diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-04 07:34:45 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-04 07:34:45 -0700 |
commit | 067393895d5677d15cd8de938ed772f28f69dd64 (patch) | |
tree | 812852fe9767418753c24e6d120cba8cfc9dfc15 /railties/lib | |
parent | 7b5a452bc9bc714c6be4128284d60a9745f2d5a9 (diff) | |
parent | af1e3b7c4805752660060d018b4a9b3e29d12128 (diff) | |
download | rails-067393895d5677d15cd8de938ed772f28f69dd64.tar.gz rails-067393895d5677d15cd8de938ed772f28f69dd64.tar.bz2 rails-067393895d5677d15cd8de938ed772f28f69dd64.zip |
Merge pull request #11665 from mshytikov/fix-config-log_level
Rails.logger should have level specified by config.log_level.
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/application/bootstrap.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index 62d57c0cc6..a26d41c0cf 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -42,7 +42,6 @@ INFO logger = ActiveSupport::Logger.new f logger.formatter = config.log_formatter logger = ActiveSupport::TaggedLogging.new(logger) - logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase) logger rescue StandardError logger = ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDERR)) @@ -53,6 +52,8 @@ INFO ) logger 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. |