aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-03-15 10:09:09 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-03-15 10:09:09 -0700
commit9caba4172e91b5be1cd8e056785fbbaa344135a1 (patch)
tree0f7ec02c0de32bad2b32b7b319813544a47f1634 /railties/lib
parent5558bb0d65b1bd9ad6aa0bd5a074c21d651248b3 (diff)
parentb7d9d6e2cd5082d269dafbc0316e2107febe1451 (diff)
downloadrails-9caba4172e91b5be1cd8e056785fbbaa344135a1.tar.gz
rails-9caba4172e91b5be1cd8e056785fbbaa344135a1.tar.bz2
rails-9caba4172e91b5be1cd8e056785fbbaa344135a1.zip
Merge pull request #9691 from hone/stdout_logging
Rails default logging to STDOUT
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application/bootstrap.rb6
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/application.rb2
2 files changed, 3 insertions, 5 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 62d57c0cc6..2a845bca17 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -39,11 +39,7 @@ INFO
f.binmode
f.sync = config.autoflush_log # if true make sure every write flushes
- 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
+ logger = ActiveSupport::TaggedLogging.create(f, config.log_formatter, config.log_level)
rescue StandardError
logger = ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDERR))
logger.level = ActiveSupport::Logger::WARN
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index daf399a538..2df2fa9a6a 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -32,5 +32,7 @@ module <%= app_const_base %>
# Disable the asset pipeline.
config.assets.enabled = false
<% end -%>
+
+ config.logger = ActiveSupport::TaggedLogging.create(STDOUT, config.log_formatter, config.log_level)
end
end