aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorLeonid Batizhevsky <l.batizhevsky@fun-box.ru>2015-04-09 21:05:49 +0400
committerKeenan Brock <keenan@thebrocks.net>2016-12-30 15:57:32 -0500
commit6efdb7177bcafe5034d210759446deec1feb6880 (patch)
tree67f816d9db026b23247f09f067481a50c3d6716f /railties/lib
parent8ebd34b249fbcc392d058e18538aeca1f2fb5293 (diff)
downloadrails-6efdb7177bcafe5034d210759446deec1feb6880.tar.gz
rails-6efdb7177bcafe5034d210759446deec1feb6880.tar.bz2
rails-6efdb7177bcafe5034d210759446deec1feb6880.zip
Allow log remote ip addres when config.action_dispatch.trusted_proxies passed
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application/default_middleware_stack.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application/default_middleware_stack.rb b/railties/lib/rails/application/default_middleware_stack.rb
index 14c0a8cbe4..5ecc7bb7c6 100644
--- a/railties/lib/rails/application/default_middleware_stack.rb
+++ b/railties/lib/rails/application/default_middleware_stack.rb
@@ -42,11 +42,12 @@ module Rails
middleware.use ::Rack::MethodOverride unless config.api_only
middleware.use ::ActionDispatch::RequestId
+ middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
# Must come after Rack::MethodOverride to properly log overridden methods
+ # Must come after ActionDispatch::RemoteIP to properly log ip address
middleware.use ::Rails::Rack::Logger, config.log_tags
middleware.use ::ActionDispatch::ShowExceptions, show_exceptions_app
middleware.use ::ActionDispatch::DebugExceptions, app, config.debug_exception_response_format
- middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
unless config.cache_classes
middleware.use ::ActionDispatch::Reloader, app.reloader