whi-cassie 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2b6308396ee1aa3b56d2bbf5e8aac4c7761454f37054049619154362bca277
-  data.tar.gz: 884c1de5a55bc6a22d4a0acfebfea4c8fd1b6056c3794e69f06009eb4941992b
+  metadata.gz: 8c87e681cda4e500a2f9cb34eee05a806525cce81305f2732ff6b33bd9c13170
+  data.tar.gz: 4edfe67aa1bba47bac102cd3b1b181240bab73469e45d16c0a1cc922467c74e8
 SHA512:
-  metadata.gz: 5594ac24a519edf94ae03a082a169c460344449c84028da950b0ddcdc521fd434b4601828df501132ef68bb1ec480aad2176312bea15ec4fd3daba34274d2e87
-  data.tar.gz: 6dd17634a7c1879d0b94730aad7d083546dabb03135b1c77f830a76d3a451a9c5b84bd5842f44660752484b4110c1b6b5c9682f50bba04ef49b5ea83313f77a2
+  metadata.gz: 8b1e1b1e0f674740d0f217a608ae1f024fff3c2529b6a29028b46cb6cbbbc6a077c2dc0b4fb8e2c0b0fa5dd6fa6cc233df74c76ce302378a738583c2fa3ea6a6
+  data.tar.gz: e192c9f23cd323468b47dbc20762e63dc891c6837e6863eb56ea2abee7611d5b50289795dc9da5b6061c9b62495833df5c61599ff7feec15ca00a31a89dbee83

data/.github/workflows/continuous_integration.yml

@@ -28,13 +28,13 @@ jobs:
       - name: standardrb
         if:   matrix.job == 'standardrb'
         run:  bundle exec rake standard
-    
+
   specs:
     name: ${{ matrix.job }} ruby-${{ matrix.ruby }} ${{ matrix.activemodel && format('activemodel-{0}', matrix.activemodel) }} cassandra-${{ matrix.cassandra_version }}
     runs-on: ubuntu-latest
     services:
       cassandra:
-        image: cassandra:${{ matrix.cassandra_version }}
+        image: cassandra:${{ matrix.cassandra_version || 'latest' }}
         ports:
           - 9042:9042
     strategy:
@@ -55,8 +55,10 @@ jobs:
             cassandra_version: "2"
           - ruby: "2.7"
             activemodel: "6"
+            job: rspec
           - ruby: "3.0"
             activemodel: "7"
+            job: rspec
     steps:
       - name: checkout
         uses: actions/checkout@v2

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 1.3.2
+
+* Improved synchronization on reconnect logic.
+
 ## 1.3.1
 
 * Remove automatic reconnect on I/O errors.

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/cassie.rb

@@ -128,7 +128,9 @@ class Cassie
   # like passenger or unicorn you should call this method after forking.
   def reconnect
     disconnect
-    connect
+    @monitor.synchronize do
+      connect unless connected?
+    end
   end
 
   # Prepare a CQL statement for repeate execution. Prepared statements
@@ -329,7 +331,13 @@ class Cassie
   end
 
   def session
-    connect unless connected?
+    unless connected?
+      # Check again inside the monitor lock so we don't get in a race condition
+      # where another thread has already established the connection.
+      @monitor.synchronize do
+        connect unless connected?
+      end
+    end
     @session
   end
 

data/spec/cassie/model_spec.rb

@@ -133,7 +133,7 @@ describe Cassie::Model do
   describe "batch" do
     it "should delegate to Cassie.batch using the write consistency" do
       expect(Cassie::Thing.connection).to be_a(Cassie)
-      expect(Cassie::Thing.connection).to receive(:batch).with(consistency: :quorum).and_call_original
+      expect(Cassie::Thing.connection).to receive(:batch).and_call_original
       Cassie::Thing.batch {}
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whi-cassie
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - We Heart It
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver