node_manager.rb in dcell-0.12.0.pre

- old
+ new

@@ -2,19 +2,17 @@
   # Manage nodes we're connected to
   class NodeManager
     include Celluloid::ZMQ
     include Enumerable
 
-    attr_reader :gossip_rate, :heartbeat_timeout
+    attr_reader :heartbeat_rate, :heartbeat_timeout
 
     def initialize
       @nodes = {}
 
-      @gossip_rate       = 5  # How often to send gossip in seconds
+      @heartbeat_rate    = 5  # How often to send heartbeats in seconds
       @heartbeat_timeout = 10 # How soon until a lost heartbeat triggers a node partition
-      each { |node| node.socket if node } # Connect all so we can gossip
-      @gossip = after(gossip_rate) { gossip_timeout }
     end
 
     # Return all available nodes in the cluster
     def all
       Directory.all.map do |node_id|
@@ -45,37 +43,7 @@
 
       @nodes[id] ||= node
       @nodes[id]
     end
     alias_method :[], :find
-
-    # Send gossip to a random node (except ourself) after the given interval
-    def gossip_timeout
-      nodes = select { |node| node.state == :connected }
-      peer = nodes.select { |node| node.id != DCell.id }.sample(1)[0]
-      if peer
-        nodes = nodes.inject([]) { |a,n| a << [n.id, n.addr, n.timestamp]; a }
-        data = nil
-        if DCell.registry.is_a? Registry::GossipAdapter
-          data = peer.fresh? ? DCell.registry.values : DCell.registry.changed
-        end
-        DCell.me.tick
-        peer.send_message DCell::Message::Gossip.new nodes, data
-      end
-      @gossip = after(gossip_rate) { gossip_timeout }
-    end
-
-    def handle_gossip(peers, data)
-      peers.each do |id, addr, timestamp|
-        if (node = find(id))
-          node.handle_timestamp! timestamp
-        else
-          Directory[id] = addr
-          Celluloid::Logger.info "Found node #{id}"
-        end
-      end
-      if DCell.registry.is_a? Registry::GossipAdapter
-        data.map { |data| DCell.registry.observe data } if data
-      end
-    end
   end
 end