From 51aeae91ace4d0afb934e2d9a21000f2ddc4ea53 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 12 Mar 2012 14:25:25 -0700 Subject: allow people to specify custom formatters, use the default formatter in production so that PID and timestamp are logged. fixes #5388 --- railties/lib/rails/application/bootstrap.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'railties/lib/rails/application/bootstrap.rb') 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 -- cgit v1.2.3 From 10e1ce4fb9a430c779eb31b767cabedc3e228b51 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 12 Mar 2012 14:27:28 -0700 Subject: use AS::Logger so we are consistent --- railties/lib/rails/application/bootstrap.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/application/bootstrap.rb') diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index 4ee77f7726..e567df7162 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -32,7 +32,7 @@ module Rails f.binmode f.sync = config.autoflush_log # if true make sure every write flushes - logger = ::Logger.new f + 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) -- cgit v1.2.3