diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-02-07 18:27:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-07 18:27:26 -0500 |
commit | ac0dcbdc77895c856ca18c584f6068a93cff1109 (patch) | |
tree | afa8e0b72ca3fc630a620d95d0d434cb69264e83 /activerecord/lib/active_record/middleware/database_selector/resolver.rb | |
parent | b67d5c6dedbf033515a96a95d24d085bf99a0d07 (diff) | |
parent | a68bcde50660ba3adf4a2659f46212ad319cfeea (diff) | |
download | rails-ac0dcbdc77895c856ca18c584f6068a93cff1109.tar.gz rails-ac0dcbdc77895c856ca18c584f6068a93cff1109.tar.bz2 rails-ac0dcbdc77895c856ca18c584f6068a93cff1109.zip |
Merge pull request #35182 from jhawthorn/db-selection-refactor
Improve naming in DatabaseSelector
Diffstat (limited to 'activerecord/lib/active_record/middleware/database_selector/resolver.rb')
-rw-r--r-- | activerecord/lib/active_record/middleware/database_selector/resolver.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/middleware/database_selector/resolver.rb b/activerecord/lib/active_record/middleware/database_selector/resolver.rb index a84c292714..80b8cd7cae 100644 --- a/activerecord/lib/active_record/middleware/database_selector/resolver.rb +++ b/activerecord/lib/active_record/middleware/database_selector/resolver.rb @@ -18,18 +18,18 @@ module ActiveRecord class Resolver # :nodoc: SEND_TO_REPLICA_DELAY = 2.seconds - def self.call(resolver, options = {}) - new(resolver, options) + def self.call(context, options = {}) + new(context, options) end - def initialize(resolver, options = {}) - @resolver = resolver + def initialize(context, options = {}) + @context = context @options = options @delay = @options && @options[:delay] ? @options[:delay] : SEND_TO_REPLICA_DELAY @instrumenter = ActiveSupport::Notifications.instrumenter end - attr_reader :resolver, :delay, :instrumenter + attr_reader :context, :delay, :instrumenter def read(&blk) if read_from_primary? @@ -68,7 +68,7 @@ module ActiveRecord instrumenter.instrument("database_selector.active_record.wrote_to_primary") do yield ensure - resolver.update_last_write_timestamp + context.update_last_write_timestamp end end end @@ -82,7 +82,7 @@ module ActiveRecord end def time_since_last_write_ok? - Time.now - resolver.last_write_timestamp >= send_to_replica_delay + Time.now - context.last_write_timestamp >= send_to_replica_delay end end end |