Skip to content

Commit 6a8d165

Browse files
authored
Merge pull request #1283 from supercaracal/fix-cluster-client-delay-loading-for-router-module
2 parents 13f3246 + 8611b68 commit 6a8d165

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cluster/lib/redis/cluster/client.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ def initialize(*)
5454
ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
5555

5656
def id
57-
@router.node_keys.join(' ')
57+
server_url.join(' ')
5858
end
5959

6060
def server_url
61-
@router.node_keys
61+
@router.nil? ? @config.startup_nodes.keys : router.node_keys
6262
end
6363

6464
def connected?
@@ -115,9 +115,9 @@ def watch(*keys, &block)
115115
end
116116

117117
handle_errors do
118-
RedisClient::Cluster::OptimisticLocking.new(@router).watch(keys) do |c, slot, asking|
118+
RedisClient::Cluster::OptimisticLocking.new(router).watch(keys) do |c, slot, asking|
119119
transaction = Redis::Cluster::TransactionAdapter.new(
120-
self, @router, @command_builder, node: c, slot: slot, asking: asking
120+
self, router, @command_builder, node: c, slot: slot, asking: asking
121121
)
122122

123123
result = yield transaction

cluster/redis-clustering.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ Gem::Specification.new do |s|
4747
s.required_ruby_version = '>= 2.7.0'
4848

4949
s.add_runtime_dependency('redis', s.version)
50-
s.add_runtime_dependency('redis-cluster-client', '>= 0.7.11')
50+
s.add_runtime_dependency('redis-cluster-client', '>= 0.10.0')
5151
end

0 commit comments

Comments
 (0)