rgossip2 0.2.1 → 0.2.2

data/README

@@ -1,4 +1,4 @@
-= rgossip
+= rgossip2
 
 == Description
 

data/lib/rgossip2/client.rb

@@ -1,4 +1,6 @@
 require 'socket'
+require 'timeout'
+require 'rping'
 
 module RGossip2
 
@@ -48,15 +50,21 @@ module RGossip2
       @node_list[@address] = @self_node
 
       # 初期ノードを追加
+      initial_nodes_threads = []
+
       initial_nodes.uniq.each do |i|
-        addr = name2addr(i)
-        # 自ノードはスキップ
-        next if addr == @address
-        # つながらない場合はスキップ
-        next unless connectable?(addr, @context.port)
-        @node_list[addr] = create(Node, @node_list, @dead_list, addr, nil, nil)
+        initial_nodes_threads << Thread.start(i) do |addr|
+          addr = name2addr(i)
+          # 自ノードはスキップ
+          next if addr == @address
+          # つながらない場合はスキップ
+          next unless connectable?(addr, @context.port)
+          @node_list[addr] = create(Node, @node_list, @dead_list, addr, nil, nil)
+        end
       end
 
+      initial_nodes_threads.each {|i| i.join }
+
       # Gossiper、Receiverを生成
       @gossiper = create(Gossiper, @self_node, @node_list)
       @receiver = create(Receiver, @self_node, @node_list, @dead_list)
@@ -204,12 +212,32 @@ module RGossip2
     end
 
     def connectable?(host, port)
+      # フラグが立っている場合はpingもチェック
+      if @context.ping_init_nodes
+        ping_results = RPing.ping(host,
+          :count => @context.ping_count, :interval => @context.ping_interval, :timeout => @context.ping_timeout)
+        raise 'ping failed' if ping_results.all? {|i| i.nil? }
+      end
+
       s = UDPSocket.new
       s.connect(host, port)
-      s.close
+      s.send('', 0)
+
+      begin
+        timeout(@context.udp_timeout) do
+          s.recv(@context.buffer_size)
+        end
+      rescue Timeout::Error
+      ensure
+        s.close
+      end
+
+      debug("#{host}(#{port}) is connectable")
+
       return true
-    rescue => e
-      debug("#{host}:#{port}: #{e.message}")
+    rescue Exception => e
+      debug("#{host}(#{port}) is not connectable: #{e.message}")
+
       return false
     end
 

data/lib/rgossip2/context.rb

@@ -34,6 +34,15 @@ module RGossip2
     # 受信タイムアウト
     attr_accessor :receive_timeout
 
+    # 初期ノードのUDPスキャンのタイムアウト
+    attr_accessor :udp_timeout
+
+    # 初期ノードのpingチェックの有無
+    attr_accessor :ping_init_nodes
+    attr_accessor :ping_count
+    attr_accessor :ping_interval
+    attr_accessor :ping_timeout
+
     # ロガー
     attr_accessor :logger
 
@@ -59,6 +68,11 @@ module RGossip2
         :digest_algorithm => OpenSSL::Digest::SHA256,
         :digest_length    => 32, # 256 / 8
         :logger           => default_logger,
+        :udp_timeout      => 0.3,
+        :ping_init_nodes  => true,
+        :ping_count       => 3,
+        :ping_interval    => 0.1,
+        :ping_timeout     => 0.1,
         :callback_handler => nil,
       }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rgossip2
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - winebarrel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 +09:00
-default_executable: 
+date: 2012-01-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: msgpack
@@ -32,6 +31,22 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rping
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
+        version: 0.1.4
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: sgwr_dts@yahoo.co.jp
 executables: 
@@ -43,16 +58,15 @@ extra_rdoc_files: []
 files: 
 - README
 - bin/gossip
+- lib/rgossip2.rb
+- lib/rgossip2/timer.rb
+- lib/rgossip2/gossipper.rb
 - lib/rgossip2/client.rb
+- lib/rgossip2/receiver.rb
 - lib/rgossip2/context.rb
-- lib/rgossip2/context_helper.rb
-- lib/rgossip2/gossipper.rb
 - lib/rgossip2/node.rb
+- lib/rgossip2/context_helper.rb
 - lib/rgossip2/node_list.rb
-- lib/rgossip2/receiver.rb
-- lib/rgossip2/timer.rb
-- lib/rgossip2.rb
-has_rdoc: true
 homepage: https://bitbucket.org/winebarrel/rgossip2
 licenses: []
 
@@ -82,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Basic implementation of a gossip protocol. This is a porting of Java implementation. see http://code.google.com/p/gossip-protocol-java/