diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-10-19 14:45:42 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-10-19 14:45:42 -0500 |
| commit | ada78066fdbccffb1da092a2470211fa252b3c99 (patch) | |
| tree | 796c2dafdf9e1789f520faa96d4c0e36fc93510a /actionpack | |
| parent | 1b50207ed3a2f545763b8c0b3afcd35d9d36d4e0 (diff) | |
| download | rails-ada78066fdbccffb1da092a2470211fa252b3c99.tar.gz rails-ada78066fdbccffb1da092a2470211fa252b3c99.tar.bz2 rails-ada78066fdbccffb1da092a2470211fa252b3c99.zip | |
Blah, SecureRandom#uuid is not supported in 1.8.7 -- cant wait for Rails 4.0 to drop compatibility with 1.8.x
Diffstat (limited to 'actionpack')
| -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 cdddc55aae..4728e9f71e 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.uuid + SecureRandom.hex(16) end end end diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb index bdadbf6644..230ff54889 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+-\w+-\w+-\w+-\w+/, stub_request.uuid + assert_match /\w+/, stub_request.uuid end private |