From 7f5cf3a3daececa062299a2b9c86631aa0c3a0cb Mon Sep 17 00:00:00 2001 From: David Ilizarov Date: Fri, 15 Aug 2014 15:44:01 -0700 Subject: Aliased the ActionDispatch::Request#uuid method with ActionDispatch::Request#request_id --- actionpack/lib/action_dispatch/http/request.rb | 2 ++ actionpack/lib/action_dispatch/middleware/request_id.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index cadbfc88cb..6571060793 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -253,6 +253,8 @@ module ActionDispatch @uuid ||= env["action_dispatch.request_id"] end + alias_method :request_id, :uuid + # Returns the lowercase name of the HTTP server software. def server_software (@env['SERVER_SOFTWARE'] && /^([a-zA-Z]+)/ =~ @env['SERVER_SOFTWARE']) ? $1.downcase : nil diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb index cf31815c23..b9ca524309 100644 --- a/actionpack/lib/action_dispatch/middleware/request_id.rb +++ b/actionpack/lib/action_dispatch/middleware/request_id.rb @@ -3,7 +3,7 @@ require 'active_support/core_ext/string/access' module ActionDispatch # Makes a unique request id available to the action_dispatch.request_id env variable (which is then accessible through - # ActionDispatch::Request#uuid) and sends the same id to the client via the X-Request-Id header. + # ActionDispatch::Request#uuid or the alias ActionDispatch::Request#request_id) and sends the same id to the client via the X-Request-Id header. # # The unique request id is either based on the X-Request-Id header in the request, which would typically be generated # by a firewall, load balancer, or the web server, or, if this header is not available, a random uuid. If the -- cgit v1.2.3