diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-10 15:42:08 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-07-10 15:42:08 -0700 |
| commit | 8f81f7a73d4a5433fe8af57f706d4d1e37d8459b (patch) | |
| tree | 6a521f59a2bd976ce6c5974e77e8f30f9df768fc /railties/lib/rails/application/finisher.rb | |
| parent | 17a6e603bbc64157f0fc0b648ae1a4f1db97ca7d (diff) | |
| parent | 0b93c48bbe74857ead9a9ef56b35f87965edbb49 (diff) | |
| download | rails-8f81f7a73d4a5433fe8af57f706d4d1e37d8459b.tar.gz rails-8f81f7a73d4a5433fe8af57f706d4d1e37d8459b.tar.bz2 rails-8f81f7a73d4a5433fe8af57f706d4d1e37d8459b.zip | |
Merge pull request #17102 from matthewd/load-interlock
Concurrent load interlock (rm Rack::Lock)
Diffstat (limited to 'railties/lib/rails/application/finisher.rb')
| -rw-r--r-- | railties/lib/rails/application/finisher.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 0599e988d9..f8f92792a7 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -86,8 +86,10 @@ module Rails # added in the hook are taken into account. initializer :set_clear_dependencies_hook, group: :all do callback = lambda do - ActiveSupport::DescendantsTracker.clear - ActiveSupport::Dependencies.clear + ActiveSupport::Dependencies.interlock.attempt_loading do + ActiveSupport::DescendantsTracker.clear + ActiveSupport::Dependencies.clear + end end if config.reload_classes_only_on_change |