redic 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84d7eceeb333b9b35cc90c4f547e2b3fdab09a020e9d35757b157e35ba492313
-  data.tar.gz: 93f784db08ad406d3c51b38eb6bb1d4531958ccb2f52a3349e7064eb05b82fb4
+  metadata.gz: f6e40f39f9e3b3856efa6b485e4d6b15f11756e1f4b21d5871ad17325ec3725d
+  data.tar.gz: 444278b49a7af254e319102a82b7dedfb232056aae792fb929ac4f159e2d534d
 SHA512:
-  metadata.gz: 7a7654679f3f606629d19805e497c8f61e10c9b8ad22431ea9140c7a178438490921b32c4f1906c90a88efc5889adf23997b893309ad8d4f356a2a8be767d1d3
-  data.tar.gz: 6452cf23dc723e16c28b3b699e65d2ad4f29c3ac76af406aa20a2585d2cb124f36d27e7102c07041a7e8a999bc60464ec57d97c77d590db466114229d863c5a2
+  metadata.gz: 79fb3629f83e0fe1d5a0dd27a4d95bf2949a691898b35e10b5e74bcfaeb7039cb3a18e05251c1e2bdf27346e537cb0040d254c4531247db34f3ce96f13ba54dd
+  data.tar.gz: 0065a647b04d3575cf3715829d558ee772f663998f972e8bf55af7e1d58cbf97ac60b02d59c9658939318724835aa3f65fc24384a124fbdc69acec156892c5b2

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.5.2
+
+- Prevent concurrent when connecting.
+
 1.5.1
 
 - Allow timeout to be changed.

data/lib/redic/client.rb

@@ -31,14 +31,13 @@ class Redic
     end
 
     def connect
-      establish_connection unless connected?
-
       @semaphore.synchronize do
+        establish_connection unless connected?
         yield
+      rescue Errno::ECONNRESET
+        @connection = false
+        retry
       end
-    rescue Errno::ECONNRESET
-      @connection = false
-      retry
     end
 
     def connected?
@@ -54,7 +53,7 @@ class Redic
 
     def quit
       if connected?
-        assert_ok(call("QUIT"))
+        assert_ok(@semaphore.synchronize { call("QUIT") })
         disconnect!
 
         true
@@ -83,10 +82,8 @@ class Redic
     end
 
     def call(*args)
-      @semaphore.synchronize do
-        write(args)
-        read
-      end
+      write(args)
+      read
     end
 
     def assert(value, error)

data/redic.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = "redic"
-  s.version           = "1.5.1"
+  s.version           = "1.5.2"
   s.summary           = "Lightweight Redis Client"
   s.description       = "Lightweight Redis Client"
   s.authors           = ["Michel Martens", "Cyril David"]

data/tests/redic_test.rb

@@ -159,6 +159,20 @@ test "thread safety" do |c|
   assert_equal ["2"], bars.uniq
 end
 
+test "uses thread safe establishing connecting to avoid sending data to" \
+     "client disconnected by concurrent thread" do |c|
+  c.client.define_singleton_method(:read) do |*otps|
+    sleep 0.1 # make sure that second thread is already waiting on sending data
+    c.client.instance_variable_get(:@connection).disconnect
+  end
+
+  t1 = Thread.new { c.call("GET", "foo") }
+  t2 = Thread.new { c.call("GET", "bar") }
+
+  t1.join
+  t2.join
+end
+
 test "blocking commands" do |c1|
   c2 = Redic.new
   r = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redic
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Michel Martens
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
@@ -66,8 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Lightweight Redis Client