aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/middleware/database_selector/resolver.rb
diff options
context:
space:
mode:
authorJohn Hawthorn <john@hawthorn.email>2019-02-07 11:59:45 -0800
committerJohn Hawthorn <john@hawthorn.email>2019-02-07 14:32:54 -0800
commita68bcde50660ba3adf4a2659f46212ad319cfeea (patch)
tree1145ff3f0faea8ef0e44c06fd3970a14f6c170d1 /activerecord/lib/active_record/middleware/database_selector/resolver.rb
parented1f392ea6f3919aceda2d45f08cfa34780750f1 (diff)
downloadrails-a68bcde50660ba3adf4a2659f46212ad319cfeea.tar.gz
rails-a68bcde50660ba3adf4a2659f46212ad319cfeea.tar.bz2
rails-a68bcde50660ba3adf4a2659f46212ad319cfeea.zip
Rename database selector operations to context
Diffstat (limited to 'activerecord/lib/active_record/middleware/database_selector/resolver.rb')
-rw-r--r--activerecord/lib/active_record/middleware/database_selector/resolver.rb14
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 775be95e0b..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(operations, options = {})
- new(operations, options)
+ def self.call(context, options = {})
+ new(context, options)
end
- def initialize(operations, options = {})
- @operations = operations
+ 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 :operations, :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
- operations.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 - operations.last_write_timestamp >= send_to_replica_delay
+ Time.now - context.last_write_timestamp >= send_to_replica_delay
end
end
end