aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-20 20:45:01 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-20 20:47:59 -0200
commit027d484f1d0c77855c09099091f7c3b5c976a7c0 (patch)
treeb21ca15b134ebacf5d5b64b44197bb630435c605 /actionpack/lib
parent7f5cf3a3daececa062299a2b9c86631aa0c3a0cb (diff)
downloadrails-027d484f1d0c77855c09099091f7c3b5c976a7c0.tar.gz
rails-027d484f1d0c77855c09099091f7c3b5c976a7c0.tar.bz2
rails-027d484f1d0c77855c09099091f7c3b5c976a7c0.zip
Prefer request_id over uuid and test the alias
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/http/request.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 6571060793..07b3814ca4 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -50,7 +50,7 @@ module ActionDispatch
@original_fullpath = nil
@fullpath = nil
@ip = nil
- @uuid = nil
+ @request_id = nil
end
def check_path_parameters!
@@ -249,11 +249,11 @@ module ActionDispatch
#
# This unique ID is useful for tracing a request from end-to-end as part of logging or debugging.
# This relies on the rack variable set by the ActionDispatch::RequestId middleware.
- def uuid
- @uuid ||= env["action_dispatch.request_id"]
+ def request_id
+ @request_id ||= env["action_dispatch.request_id"]
end
- alias_method :request_id, :uuid
+ alias_method :uuid, :request_id
# Returns the lowercase name of the HTTP server software.
def server_software