aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-10-19 22:39:11 +0200
committerJosé Valim <jose.valim@gmail.com>2011-10-19 22:39:11 +0200
commitc83d9a11c00bc13e1f8f0fa0e8fb6185cacd5fc9 (patch)
tree0f551c45ee8ecfd954532217dabe437c768ee972 /railties/lib/rails/application.rb
parent6c126015a676c376f1646713fbb739049a783238 (diff)
downloadrails-c83d9a11c00bc13e1f8f0fa0e8fb6185cacd5fc9.tar.gz
rails-c83d9a11c00bc13e1f8f0fa0e8fb6185cacd5fc9.tar.bz2
rails-c83d9a11c00bc13e1f8f0fa0e8fb6185cacd5fc9.zip
Unify logger and taggedlogging middleware as both address logging concerns.
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index a097cfd1be..82fffe86bb 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -165,8 +165,7 @@ module Rails
middleware.use ::Rack::Runtime
middleware.use ::Rack::MethodOverride
middleware.use ::ActionDispatch::RequestId
- middleware.use ::Rails::Rack::TaggedLogging, config.log_tags
- middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods
+ middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods
middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
if config.action_dispatch.x_sendfile_header.present?