diff options
| author | Jerry D'Antonio <stumpjumper@gmail.com> | 2015-09-19 09:56:26 -0400 |
|---|---|---|
| committer | Jerry D'Antonio <stumpjumper@gmail.com> | 2015-09-19 09:56:26 -0400 |
| commit | 56ac6e4768adb1f7055474d40a9e921380559c43 (patch) | |
| tree | 01e085d38060f8739944177d6001c6996b6fc779 /actionview/lib/action_view/digestor.rb | |
| parent | 0c39a022b0b432afff240c5624dadee00da8d175 (diff) | |
| download | rails-56ac6e4768adb1f7055474d40a9e921380559c43.tar.gz rails-56ac6e4768adb1f7055474d40a9e921380559c43.tar.bz2 rails-56ac6e4768adb1f7055474d40a9e921380559c43.zip | |
Replaced `ThreadSafe::Map` with successor `Concurrent::Map`.
The thread_safe gem is being deprecated and all its code has been merged
into the concurrent-ruby gem. The new class, Concurrent::Map, is exactly
the same as its predecessor except for fixes to two bugs discovered
during the merge.
Diffstat (limited to 'actionview/lib/action_view/digestor.rb')
| -rw-r--r-- | actionview/lib/action_view/digestor.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionview/lib/action_view/digestor.rb b/actionview/lib/action_view/digestor.rb index 9a8a4feb2e..12e9723a02 100644 --- a/actionview/lib/action_view/digestor.rb +++ b/actionview/lib/action_view/digestor.rb @@ -1,11 +1,11 @@ -require 'thread_safe' +require 'concurrent' require 'action_view/dependency_tracker' require 'monitor' module ActionView class Digestor cattr_reader(:cache) - @@cache = ThreadSafe::Cache.new + @@cache = Concurrent::Map.new @@digest_monitor = Monitor.new class PerRequestDigestCacheExpiry < Struct.new(:app) # :nodoc: @@ -28,7 +28,7 @@ module ActionView cache_key = ([ options[:name], options[:finder].details_key.hash ].compact + Array.wrap(options[:dependencies])).join('.') # this is a correctly done double-checked locking idiom - # (ThreadSafe::Cache's lookups have volatile semantics) + # (Concurrent::Map's lookups have volatile semantics) @@cache[cache_key] || @@digest_monitor.synchronize do @@cache.fetch(cache_key) do # re-check under lock compute_and_store_digest(cache_key, options) |