redlock 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0dee2cedbef9dc37a61a0708dc788287d3ab70b96bfd2561267ddd580e128f9
-  data.tar.gz: 7e6292d1b22149c3c538c7f3bbd0285a9a7c51ef472d2ec22e99190927da5967
+  metadata.gz: 9dd90bf121367947d80385e0e24ec5aabe59e0e5452ee0d6dc7904fbd0a93fc7
+  data.tar.gz: d42662fb6a39139c47a9b0eff70efcdf5f59c067a1ab9d2205d0d881a94f2a73
 SHA512:
-  metadata.gz: 4fccf4ff8a3c5647e828a71b6b982b67f5bc1cc702a88279752ce53fc88addc4f5ffaa657f4c7f5f5ca09bfb9ee27f2aee8f7551a9bfa655f176d99c98d76051
-  data.tar.gz: ef9d3a5f10ec4b62b41ee890a69eb91ff16d92832ca75d82fb1387145330f979d8d01b614bf0893ad29669056f479a44f64278effcdbcc74150be2a4a2258f3d
+  metadata.gz: 3461e69ab931dd23bb5cf7a6d6d819a0fecf76eccb62a37e058e27a40780a5a9141f56b3d274ca94e4e51dd3edd9cd0c767ed8b3b2d6d6c33a5590d7b4531136
+  data.tar.gz: e29da6290a7192dc20ed68171c793a8b682a8849ecced7fab68d72a289f033661296846f4c908a82579a43bb5dbfa51cdd5392bef8ef728eaca5f4275d61addd

data/lib/redlock/client.rb

@@ -157,24 +157,19 @@ module Redlock
     private
 
     class RedisInstance
-      module ConnectionPoolLike
-        def with
-          yield self
-        end
-      end
-
       def initialize(connection)
         @monitor = Monitor.new
 
-        if connection.respond_to?(:with)
+        if connection.respond_to?(:call)
           @redis = connection
         else
           if connection.respond_to?(:client)
             @redis = connection
-          else
+          elsif connection.respond_to?(:key?)
             @redis = initialize_client(connection)
+          else
+            @redis = connection
           end
-          @redis.extend(ConnectionPoolLike)
         end
       end
 
@@ -202,7 +197,7 @@ module Redlock
       end
 
       def synchronize
-        @monitor.synchronize { @redis.with { |connection| yield(connection) } }
+        @monitor.synchronize { @redis.then { |connection| yield(connection) } }
       end
 
       def lock(resource, val, ttl, allow_new_lock)
@@ -324,7 +319,8 @@ module Redlock
         @servers.each { |s| s.unlock(resource, value) }
 
         if errors.size >= @quorum
-          raise LockAcquisitionError.new('Too many Redis errors prevented lock acquisition', errors)
+          err_msgs = errors.map { |e| "#{e.class}: #{e.message}" }.join("\n")
+          raise LockAcquisitionError.new("Too many Redis errors prevented lock acquisition:\n#{err_msgs}", errors)
         end
 
         false

data/lib/redlock/version.rb

@@ -1,3 +1,3 @@
 module Redlock
-  VERSION = '2.0.4'
+  VERSION = '2.0.6'
 end

data/spec/client_spec.rb

@@ -30,11 +30,7 @@ RSpec.describe Redlock::Client do
   let(:redis3_host) { ENV["REDIS3_HOST"] || "127.0.0.1" }
   let(:redis3_port) { ENV["REDIS3_PORT"] || "6379" }
   let(:unreachable_redis) {
-    redis = RedisClient.new(url: 'redis://localhost:46864')
-    def redis.with
-      yield self
-    end
-    redis
+    RedisClient.new(url: 'redis://localhost:46864')
   }
 
   describe 'initialize' do
@@ -112,9 +108,19 @@ RSpec.describe Redlock::Client do
         it 'fails to acquire a lock if majority of Redis instances are not available' do
           redlock = Redlock::Client.new(servers_without_quorum)
 
+          expected_msg = <<~MSG
+            failed to acquire lock on 'Too many Redis errors prevented lock acquisition:
+            RedisClient::CannotConnectError: Connection refused - connect(2) for 127.0.0.1:46864
+            RedisClient::CannotConnectError: Connection refused - connect(2) for 127.0.0.1:46864'
+          MSG
+
           expect {
             redlock.lock(resource_key, ttl)
-          }.to raise_error(Redlock::LockAcquisitionError)
+          }.to raise_error do |error|
+            expect(error).to be_a(Redlock::LockAcquisitionError)
+            expect(error.message).to eq(expected_msg.chomp)
+            expect(error.errors.size).to eq(2)
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redlock
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Leandro Moreira
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-20 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client