aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-03-15 10:38:00 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-03-15 10:38:00 -0700
commit1a9055073dcc189b289a1e3f47cbc72ff7380f0a (patch)
treed9751d5556a262a8e14edfe940325d8adc2074c3 /railties/lib
parent29030d3f89298905acc782df89b758d163dcf630 (diff)
downloadrails-1a9055073dcc189b289a1e3f47cbc72ff7380f0a.tar.gz
rails-1a9055073dcc189b289a1e3f47cbc72ff7380f0a.tar.bz2
rails-1a9055073dcc189b289a1e3f47cbc72ff7380f0a.zip
Revert "make new rails apps log to STDOUT"
This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451. Per discussion with @jeremy and @rubys on Campfire.
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, 5 insertions, 3 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 2a845bca17..62d57c0cc6 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -39,7 +39,11 @@ INFO
f.binmode
f.sync = config.autoflush_log # if true make sure every write flushes
- logger = ActiveSupport::TaggedLogging.create(f, config.log_formatter, config.log_level)
+ 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))
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 2df2fa9a6a..daf399a538 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -32,7 +32,5 @@ 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