aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJohn Hawthorn <john@hawthorn.email>2019-02-06 11:57:30 -0800
committerJohn Hawthorn <john@hawthorn.email>2019-02-06 11:57:30 -0800
commited1f392ea6f3919aceda2d45f08cfa34780750f1 (patch)
treedeea4a5508f6a7173c596a908de66aa3e2fac8d0 /activerecord
parent6aaf01385e95376938275f484852b88fe84088b8 (diff)
downloadrails-ed1f392ea6f3919aceda2d45f08cfa34780750f1.tar.gz
rails-ed1f392ea6f3919aceda2d45f08cfa34780750f1.tar.bz2
rails-ed1f392ea6f3919aceda2d45f08cfa34780750f1.zip
Rename resolver ivar to operations in Resolver
We're already in the resolver, we call this class "operations" in the middleware, so we should use the same naming here.
Diffstat (limited to 'activerecord')
-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 a84c292714..775be95e0b 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(operations, options = {})
+ new(operations, options)
end
- def initialize(resolver, options = {})
- @resolver = resolver
+ def initialize(operations, options = {})
+ @operations = operations
@options = options
@delay = @options && @options[:delay] ? @options[:delay] : SEND_TO_REPLICA_DELAY
@instrumenter = ActiveSupport::Notifications.instrumenter
end
- attr_reader :resolver, :delay, :instrumenter
+ attr_reader :operations, :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
+ operations.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 - operations.last_write_timestamp >= send_to_replica_delay
end
end
end