cluster.rb in aerospike-0.1.5

- old
+ new

@@ -15,11 +15,11 @@
 # the License.
 
 require 'thread'
 require 'timeout'
 
-require 'atomic'
+require 'aerospike/atomic/atomic'
 
 module Aerospike
 
   private
 
@@ -208,11 +208,11 @@
           begin
             friends = node.refresh
             refresh_count += 1
             friend_list.concat(friends) if friends
           rescue => e
-            Aerospike.logger.warn("Node `#{node}` refresh failed: #{e.to_s}")
+            Aerospike.logger.error("Node `#{node}` refresh failed: #{e.to_s}")
           end
         end
       end
 
       # Add nodes in a batch.
@@ -283,11 +283,11 @@
 
       seed_array.each do |seed|
         begin
           seed_node_validator = NodeValidator.new(seed, @connection_timeout)
         rescue => e
-          Aerospike.logger.warn("Seed #{seed.to_s} failed: #{e}")
+          Aerospike.logger.error("Seed #{seed.to_s} failed: #{e}")
           next
         end
 
         nv = nil
         # Seed host may have multiple aliases in the case of round-robin dns configurations.
@@ -297,11 +297,11 @@
             nv = seed_node_validator
           else
             begin
               nv = NodeValidator.new(aliass, @connection_timeout)
             rescue Exection => e
-              Aerospike.logger.warn("Seed #{seed.to_s} failed: #{e}")
+              Aerospike.logger.error("Seed #{seed.to_s} failed: #{e}")
               next
             end
           end
 
           if !find_node_name(list, nv.name)
@@ -366,11 +366,11 @@
 
           node = create_node(nv)
           list << node
 
         rescue => e
-          Aerospike.logger.warn("Add node #{node.to_s} failed: #{e}")
+          Aerospike.logger.error("Add node #{node.to_s} failed: #{e}")
         end
       end
 
       list
     end
@@ -396,10 +396,10 @@
           # Single node clusters rely solely on node health.
           remove_list << node if node.unhealthy?
 
         when 2
           # Two node clusters require at least one successful refresh before removing.
-          if refresh_count == 1 && node.reference_count.value == 0 && !node.responded.value
+          if refresh_count == 2 && node.reference_count.value == 0 && !node.responded.value
             # Node is not referenced nor did it respond.
             remove_list << node
           end
 
         else