rabbitmq-cluster 0.0.17 → 0.0.18

data/bin/rabbitmq-cluster

@@ -2,15 +2,7 @@ require 'rabbitmq/cluster'
 
 server = RabbitMQ::Cluster::Server.build
 
-until server.up?
-  while true do
-    begin
-      server.synchronize
-    rescue => e
-      puts e.message
-      puts e.backtrace
-    end
-    sleep 5
-  end
-  sleep 1
+while true do
+  server.synchronize if server.up?
+  sleep 5
 end

data/lib/rabbitmq/cluster/server.rb

@@ -74,7 +74,7 @@ class RabbitMQ::Cluster
     end
 
     def join_cluster
-      if !clustered? && nodes_to_join.any? && up?
+      if up? && !clustered? && nodes_to_join.any?
         system("rabbitmqctl stop_app")
         system("rabbitmqctl join_cluster #{nodes_to_join.first}")
         system("rabbitmqctl start_app")
@@ -85,8 +85,6 @@ class RabbitMQ::Cluster
 
     def clustered?
       client.nodes.size > 1
-    rescue Faraday::ConnectionFailed
-      false
     end
 
     def nodes_to_join

data/lib/rabbitmq/cluster/version.rb

@@ -1,5 +1,5 @@
 module RabbitMQ
   class Cluster
-    VERSION = "0.0.17"
+    VERSION = "0.0.18"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1661270494365738817
+      hash: -1450647500986372266
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1661270494365738817
+      hash: -1450647500986372266
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25