rabbitmq-cluster 0.0.8 → 0.0.9

data/lib/rabbitmq/cluster/etcd.rb

@@ -11,38 +11,56 @@ module RabbitMQ::Cluster
     end
 
     def aquire_lock
-      sleep 1 until lock = client.update('/rabbitmq/lock', true, false)
-      yield if lock
+      with_retry do
+        sleep 1 until lock = client.update('/rabbitmq/lock', true, false)
+      end
+      yield
     ensure
       client.update('/rabbitmq/lock', false, true)
     end
 
     def nodes
-      (client.get('/rabbitmq/nodes') || {}).values.sort
+      with_retry do
+        (client.get('/rabbitmq/nodes') || {}).values.sort
+      end
     end
 
-    def register(node_name)
-      client.set(key_for(node_name), node_name, ttl: 10)
-      try = 0
-    rescue
-      sleep 1
-      try += 1
-      retry if try < 10
+    def register(node_name, wait=nil)
+      with_retry(wait) do
+        client.set(key_for(node_name), node_name, ttl: 10)
+      end
     end
 
     def erlang_cookie
-      client.get('/rabbitmq/erlang_cookie')
+      with_retry do
+        client.get('/rabbitmq/erlang_cookie')
+      end
     end
 
     def erlang_cookie=(erlang_cookie)
-      client.set(
-        '/rabbitmq/erlang_cookie',
-        erlang_cookie
-      )
+      with_retry do
+        client.set(
+          '/rabbitmq/erlang_cookie',
+          erlang_cookie
+        )
+      end
     end
 
     private
 
+    def with_retry(wait = nil)
+      wait ||= 1
+      try = 0
+      begin
+        yield
+      rescue
+        sleep wait
+        try += 1
+        retry if try < 10
+        raise
+      end
+    end
+
     def key_for(node_name)
       "/rabbitmq/nodes/#{node_name}"
     end

data/lib/rabbitmq/cluster/version.rb

@@ -1,5 +1,5 @@
 module RabbitMQ
   module Cluster
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/spec/unit/etcd_spec.rb

@@ -33,6 +33,17 @@ describe RabbitMQ::Cluster::Etcd do
       )
       subject.register(nodename)
     end
+
+    context 'somthing is wrong with etcd backend' do
+      before do
+        allow(subject).to receive(:wait).and_return(0.001)
+      end
+
+      it 'retry 10 times' do
+        expect(etcd_client).to receive(:set).exactly(10).times.and_raise
+        expect { subject.register('foo', 0.0001) }.to raise_error
+      end
+    end
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1773046111875940533
+      hash: 4354114138756305473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1773046111875940533
+      hash: 4354114138756305473
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25