aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/bootstrap.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-12 14:25:25 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-12 14:25:41 -0700
commit51aeae91ace4d0afb934e2d9a21000f2ddc4ea53 (patch)
treee5438cd412226eaccebb17397a56a190867246d7 /railties/lib/rails/application/bootstrap.rb
parent2ad34f46a1c4b8c59f37c2846ed0fcf3b4401e3a (diff)
downloadrails-51aeae91ace4d0afb934e2d9a21000f2ddc4ea53.tar.gz
rails-51aeae91ace4d0afb934e2d9a21000f2ddc4ea53.tar.bz2
rails-51aeae91ace4d0afb934e2d9a21000f2ddc4ea53.zip
allow people to specify custom formatters, use the default formatter in production so that PID and timestamp are logged. fixes #5388
Diffstat (limited to 'railties/lib/rails/application/bootstrap.rb')
-rw-r--r--railties/lib/rails/application/bootstrap.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 93a0fba10b..4ee77f7726 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -32,9 +32,9 @@ module Rails
f.binmode
f.sync = config.autoflush_log # if true make sure every write flushes
- logger = ActiveSupport::TaggedLogging.new(
- ActiveSupport::Logger.new(f)
- )
+ logger = ::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