diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-08-02 13:03:03 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-02 13:03:03 -0400 |
commit | ac7c9381f02446bb4e1681ad66cd69d8abe23594 (patch) | |
tree | 4a12db093039c6d9546d37668a53996e80e54e61 /activerecord/lib/active_record/middleware/database_selector | |
parent | f3c68c59ed57302ca54f4dfad0e91dbff426962d (diff) | |
parent | f2de448106ca3bb947dc88f96ca7d81d37b5be9a (diff) | |
download | rails-ac7c9381f02446bb4e1681ad66cd69d8abe23594.tar.gz rails-ac7c9381f02446bb4e1681ad66cd69d8abe23594.tar.bz2 rails-ac7c9381f02446bb4e1681ad66cd69d8abe23594.zip |
Merge pull request #36843 from eileencodes/add-ability-to-unset-preventing-writes
Add ability to unset preventing writes
Diffstat (limited to 'activerecord/lib/active_record/middleware/database_selector')
-rw-r--r-- | activerecord/lib/active_record/middleware/database_selector/resolver.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/middleware/database_selector/resolver.rb b/activerecord/lib/active_record/middleware/database_selector/resolver.rb index 3eb1039c50..b2aa453a8e 100644 --- a/activerecord/lib/active_record/middleware/database_selector/resolver.rb +++ b/activerecord/lib/active_record/middleware/database_selector/resolver.rb @@ -46,7 +46,7 @@ module ActiveRecord private def read_from_primary(&blk) ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do - ActiveRecord::Base.connection_handler.while_preventing_writes do + ActiveRecord::Base.connection_handler.while_preventing_writes(true) do instrumenter.instrument("database_selector.active_record.read_from_primary") do yield end @@ -64,10 +64,12 @@ module ActiveRecord def write_to_primary(&blk) ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do - instrumenter.instrument("database_selector.active_record.wrote_to_primary") do - yield - ensure - context.update_last_write_timestamp + ActiveRecord::Base.connection_handler.while_preventing_writes(false) do + instrumenter.instrument("database_selector.active_record.wrote_to_primary") do + yield + ensure + context.update_last_write_timestamp + end end end end |