whi-cassie 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c87e681cda4e500a2f9cb34eee05a806525cce81305f2732ff6b33bd9c13170
-  data.tar.gz: 4edfe67aa1bba47bac102cd3b1b181240bab73469e45d16c0a1cc922467c74e8
+  metadata.gz: da71885a1923c8c8d801ae3312151406ec78630237c43f9057c4abc6970626cd
+  data.tar.gz: a4ac1795d699b89efac12f4c5455d84095dacfe07d5634754a3ac8e129d8553f
 SHA512:
-  metadata.gz: 8b1e1b1e0f674740d0f217a608ae1f024fff3c2529b6a29028b46cb6cbbbc6a077c2dc0b4fb8e2c0b0fa5dd6fa6cc233df74c76ce302378a738583c2fa3ea6a6
-  data.tar.gz: e192c9f23cd323468b47dbc20762e63dc891c6837e6863eb56ea2abee7611d5b50289795dc9da5b6061c9b62495833df5c61599ff7feec15ca00a31a89dbee83
+  metadata.gz: 55c5506a91a5a6cc353d64ca12a0a57bb6cd691a1f4314e257fc468cfb0bdd12b60a590a1663a2cd3b200ca9da8891c80de6cd43c4b0fc12910ca155a96cead3
+  data.tar.gz: 07463a9d5b35522559405d8c94f35cd4c922e2c59e7bf62fc2cc99a91d3ff22503f9900ece00fa4ffec0d050fa5c2712b8da90b150b99d6b6eb6a0c6f02bcc00

data/HISTORY.md

@@ -1,3 +1,12 @@
+## 1.3.4
+
+* Fix syntax error.
+
+## 1.3.3 (yanked)
+
+* Restore automatic reconnect on dead connections.
+* Handle race condition on reconnect logic.
+
 ## 1.3.2
 
 * Improved synchronization on reconnect logic.

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.4

data/lib/cassie.rb

@@ -112,11 +112,13 @@ class Cassie
   # Close the connections to the Cassandra cluster.
   def disconnect
     logger&.info("Cassie.disconnect from #{config.sanitized_cluster}")
+    old_session = nil
     @monitor.synchronize do
-      @session&.close
+      old_session = @session
       @session = nil
       @prepared_statements = {}
     end
+    old_session&.close
   end
 
   # Return true if the connection to the Cassandra cluster has been established.
@@ -127,9 +129,12 @@ class Cassie
   # Force reconnection. If you're using this code in conjunction in a forking server environment
   # like passenger or unicorn you should call this method after forking.
   def reconnect
-    disconnect
+    existing_session = @session
     @monitor.synchronize do
-      connect unless connected?
+      if @session == existing_session
+        disconnect
+        connect
+      end
     end
   end
 
@@ -311,6 +316,9 @@ class Cassie
       end
 
       session.execute(statement, options || {})
+    rescue Cassandra::Errors::NoHostsAvailable => e
+      reconnect
+      raise e
     ensure
       if statement.is_a?(Cassandra::Statement) && !subscribers.empty?
         payload = Message.new(statement, options, Time.now - start_time)

metadata

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