rgossip 0.1.7 → 0.1.8

data/lib/rgossip/client.rb

@@ -101,10 +101,16 @@ module RGossip
       address = name2addr(address)
 
       @node_list.synchronize {
-        raise 'node is exist' if @node_list.any? {|i| i.address == address }
-        node = Node.new(@node_list, @dead_list, address, nil, nil, self.method(:perform_callback))
-        @node_list << node
-        node.start_timer if @running
+        @dead_list.synchronize {
+          raise 'node is exist' if @node_list.any? {|i| i.address == address }
+          node = Node.new(@node_list, @dead_list, address, nil, nil, self.method(:perform_callback))
+          @node_list << node
+          node.start_timer if @running
+
+          @dead_list.reject! do |i|
+            i.address == address
+          end
+        }
       }
     end
 
@@ -113,7 +119,10 @@ module RGossip
 
       @node_list.synchronize {
         @node_list.reject! do |i|
-          i.address == address
+          if i.address == address
+            i.stop_timer
+            true
+          end
         end
       }
     end

data/lib/rgossip/node.rb

@@ -27,6 +27,10 @@ module RGossip
         }
 
         @dead_list.synchronize {
+          @dead_list.reject! do |i|
+            i.address == @address
+          end
+
           @dead_list << self
         }
 
@@ -54,5 +58,11 @@ module RGossip
 
       @timer.reset
     end
+
+    def stop_timer
+      RGossip.log("Stop Timer: address=#{@address} lifetime=#{@@lifetime}")
+
+      @timer.stop
+    end
   end # Node
 end # RGossip

data/lib/rgossip/timer.rb

@@ -42,6 +42,15 @@ module RGossip
     rescue ThreadError
     end
 
+    def stop
+      @mutex.synchronize {
+        if_is_thread_alive? do
+          @thread.kill
+        end
+      }
+    rescue ThreadError
+    end
+
     private
     def if_is_thread_alive?
       if @thread and @thread.alive?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rgossip
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - winebarrel