diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-02-04 08:45:48 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-04 08:45:48 -0500 |
commit | f4aed53e440a63ef617b4634f160f4c512824870 (patch) | |
tree | 9a30d4f8aae3015ca647109e07a7aa6a42e27b81 /activerecord/lib/active_record/middleware/database_selector | |
parent | 84ff78be7a021b26fd8484c68065f5d464629745 (diff) | |
parent | 8d32346cdec04dd85ab682eeb9f4edfcd0c9ccef (diff) | |
download | rails-f4aed53e440a63ef617b4634f160f4c512824870.tar.gz rails-f4aed53e440a63ef617b4634f160f4c512824870.tar.bz2 rails-f4aed53e440a63ef617b4634f160f4c512824870.zip |
Merge pull request #35132 from eileencodes/allow-application-to-change-handler-names
Add ability to change the names of the default handlers
Diffstat (limited to 'activerecord/lib/active_record/middleware/database_selector')
-rw-r--r-- | activerecord/lib/active_record/middleware/database_selector/resolver.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/middleware/database_selector/resolver.rb b/activerecord/lib/active_record/middleware/database_selector/resolver.rb index 0eeb0453ef..a84c292714 100644 --- a/activerecord/lib/active_record/middleware/database_selector/resolver.rb +++ b/activerecord/lib/active_record/middleware/database_selector/resolver.rb @@ -47,7 +47,7 @@ module ActiveRecord def read_from_primary(&blk) ActiveRecord::Base.connection.while_preventing_writes do - ActiveRecord::Base.connected_to(role: :writing) do + ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do instrumenter.instrument("database_selector.active_record.read_from_primary") do yield end @@ -56,7 +56,7 @@ module ActiveRecord end def read_from_replica(&blk) - ActiveRecord::Base.connected_to(role: :reading) do + ActiveRecord::Base.connected_to(role: ActiveRecord::Base.reading_role) do instrumenter.instrument("database_selector.active_record.read_from_replica") do yield end @@ -64,7 +64,7 @@ module ActiveRecord end def write_to_primary(&blk) - ActiveRecord::Base.connected_to(role: :writing) do + ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do instrumenter.instrument("database_selector.active_record.wrote_to_primary") do yield ensure |