extendi-cassandra_object 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd527d822a4895c5206c941bf16083025307c42
-  data.tar.gz: 918d17478765af790449a2545818856358854e35
+  metadata.gz: 7f1757c6507b3cd8dee7f2abc12f0477c9c7d215
+  data.tar.gz: d0ddfe7860fee792792e11aaf1c73cf652fbb594
 SHA512:
-  metadata.gz: d14760b8e19cfaf29a8b18822b37ba8e19140c3e679b35bd05425650f0c750180dd7428e544a98068d5c719241c5f0b61e2df5a89ab90ea29712f4062b92fe8a
-  data.tar.gz: 700146529ef52a4046b0d7f39bdfedc2b09c3889f878a724bad17af14e00f113feb15977709eed4ecafb33f6a8414643c8a609b690b6861f9fbc8e0fcb051374
+  metadata.gz: 3b1a201f73f65278f1ec3b4ced3bbcd3839e4ff66e3ccb1e276e4394905d66a582897c72e34609f024737a740b18144322ca02d91459668e256a1b6f68cdfc3c
+  data.tar.gz: 947cb0f41a9908b036277d49b05c59fc71138bb6f20bdf27297b1ba16d6fe79568465416fba631b179f46ec693e2c235e6b545ed43e700977c265c49a4aaf3ec

data/extendi-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'extendi-cassandra_object'
-  s.version = '1.0.10'
+  s.version = '1.0.11'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ['Duccio Giovannelli', 'gotime']

data/lib/cassandra_object/adapters/cassandra_adapter.rb

@@ -45,7 +45,6 @@ module CassandraObject
           wheres << "#{@scope._key} = '#{id}'" if !id.nil?
           "WHERE #{wheres * ' AND '}" if wheres.any?
         end
-
       end
 
       def cassandra_cluster_options
@@ -99,16 +98,16 @@ module CassandraObject
 
         # Setting defaults
         cluster_options.merge!({
-                                heartbeat_interval: cluster_options[:heartbeat_interval] || 2,
+                                heartbeat_interval: cluster_options.keys.include?(:heartbeat_interval) ? cluster_options[:heartbeat_interval] : 30,
                                 idle_timeout: cluster_options[:idle_timeout] || 60,
-                                consistency: cluster_options[:consistency] || :quorum,
+                                max_schema_agreement_wait: 1,
+                                consistency: cluster_options[:consistency] || :one,
                                 protocol_version: cluster_options[:protocol_version] || 3,
                                 page_size: cluster_options[:page_size] || 10000
                                })
-        return cluster_options
+        cluster_options
       end
 
-
       def connection
         @connection ||= begin
           cluster = Cassandra.cluster cassandra_cluster_options

data/lib/cassandra_object/adapters/cassandra_schemaless_adapter.rb

@@ -95,7 +95,6 @@ module CassandraObject
             :idle_timeout
         ])
 
-
         {
             load_balancing_policy: 'Cassandra::LoadBalancing::Policies::%s',
             reconnection_policy: 'Cassandra::Reconnection::Policies::%s',
@@ -110,20 +109,19 @@ module CassandraObject
             end
           end
         end
-
+        
         # Setting defaults
         cluster_options.merge!({
-                                heartbeat_interval: cluster_options[:heartbeat_interval] || 2,
+                                heartbeat_interval: cluster_options.keys.include?(:heartbeat_interval) ? cluster_options[:heartbeat_interval] : 30,
                                 idle_timeout: cluster_options[:idle_timeout] || 60,
                                 max_schema_agreement_wait: 1,
-                                consistency: cluster_options[:consistency]||:quorum,
-                                protocol_version: cluster_options[:protocol_version]||3,
+                                consistency: cluster_options[:consistency] || :one,
+                                protocol_version: cluster_options[:protocol_version] || 3,
                                 page_size: cluster_options[:page_size] || 10000
                                })
-        return cluster_options
+        cluster_options
       end
 
-
       def connection
         @connection ||= begin
           cluster = Cassandra.cluster cassandra_cluster_options

data/test/support/reconnection.rb

@@ -7,10 +7,10 @@ module CassandraObject
       retries = 0
       begin
         super
-      rescue Cassandra::Errors::NoHostsAvailable, Cassandra::Errors::IOError
+      rescue Cassandra::Errors::NoHostsAvailable, Cassandra::Errors::IOError, Cassandra::Errors::ClientError => e
         @connection = nil
         retries += 1
-        retries < 2 ? retry : raise
+        retries < 10 ? retry : raise(e)
       end
     end
 
@@ -18,10 +18,11 @@ module CassandraObject
       retries = 0
       begin
         super
-      rescue Cassandra::Errors::NoHostsAvailable, Cassandra::Errors::IOError
+      rescue Cassandra::Errors::NoHostsAvailable, Cassandra::Errors::IOError, Cassandra::Errors::ClientError => e
         @connection = nil
         retries += 1
-        retries < 2 ? retry : raise
+        sleep 0.1
+        retries < 10 ? retry : raise(e)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extendi-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Duccio Giovannelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel