diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-21 05:12:24 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-21 05:12:24 -0800 |
| commit | 1f75a1fea12ead1370113ea1be0272667ab7da88 (patch) | |
| tree | eacd8b7ae6abc13408da48c61dcf180a436bb4cc | |
| parent | 893d38d7fde27b52f2b92579a1db59dc1e5e5a07 (diff) | |
| parent | 0f510e970f00ac819d331f0415db3ac5ada7b861 (diff) | |
| download | rails-1f75a1fea12ead1370113ea1be0272667ab7da88.tar.gz rails-1f75a1fea12ead1370113ea1be0272667ab7da88.tar.bz2 rails-1f75a1fea12ead1370113ea1be0272667ab7da88.zip | |
Merge pull request #4095 from arunagw/using_uuid
Using uuid which is supported in 1.9
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/request_id.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/request_id_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb index bee446c8a5..d5a0b80fd5 100644 --- a/actionpack/lib/action_dispatch/middleware/request_id.rb +++ b/actionpack/lib/action_dispatch/middleware/request_id.rb @@ -33,7 +33,7 @@ module ActionDispatch end def internal_request_id - SecureRandom.hex(16) + SecureRandom.uuid end end end diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb index b6e8b6c3ad..e2a38af233 100644 --- a/actionpack/test/dispatch/request_id_test.rb +++ b/actionpack/test/dispatch/request_id_test.rb @@ -14,7 +14,7 @@ class RequestIdTest < ActiveSupport::TestCase end test "generating a request id when none is supplied" do - assert_match(/\w+/, stub_request.uuid) + assert_match /\w+-\w+-\w+-\w+-\w+/, stub_request.uuid end private |