rabbitmq-cluster 0.0.9 → 0.0.10

data/bin/rabbitmq-cluster

@@ -11,5 +11,5 @@ server.start
 
 while true do
   server.synchronize
-  sleep 4
+  sleep 10
 end

data/bin/rabbitmq-cluster-sidekick

@@ -0,0 +1,13 @@
+require 'rabbitmq/cluster'
+
+server = RabbitMQ::Cluster::Server.new(
+  RabbitMQManager.new('http://guest:guest@localhost:15672'),
+  RabbitMQ::Cluster::Etcd.new(
+    Etcd::Client.new(uri: ENV['ETCD_HOST'])
+  )
+)
+
+while true do
+  server.healthcheck
+  sleep 4
+end

data/lib/rabbitmq/cluster/server.rb

@@ -26,14 +26,12 @@ module RabbitMQ::Cluster
     end
 
     def synchronize
-      join_cluster if up?
-      return if etcd.nodes == running_nodes
+      remove_stopped_nodes if stopped_nodes.any?
+      join_cluster
+    end
 
-      etcd.aquire_lock do
-        stopped_nodes.each do |node_name|
-          system("rabbitmqctl forget_cluster_node #{node_name}")
-        end
-      end
+    def healthcheck
+      register if up?
     end
 
     def name
@@ -60,17 +58,25 @@ module RabbitMQ::Cluster
       nodes(false)
     end
 
+    def remove_stopped_nodes
+      etcd.aquire_lock do
+        stopped_nodes.each do |node_name|
+          system("rabbitmqctl forget_cluster_node #{node_name}")
+        end
+      end
+    end
+
     def nodes(running)
       client.nodes.select { |n| n["running"] == running }.map { |n| n["name"] }.sort
     end
 
     def join_cluster
-      if !clustered? && nodes_to_join.any?
+      if !clustered? && nodes_to_join.any? && up?
         `rabbitmqctl stop_app`
         system("rabbitmqctl join_cluster #{nodes_to_join.first}")
         `rabbitmqctl start_app`
+        register if up?
       end
-      register if up?
     end
 
     def clustered?

data/lib/rabbitmq/cluster/version.rb

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

data/spec/unit/server_spec.rb

@@ -70,7 +70,7 @@ describe RabbitMQ::Cluster::Server do
 
     context 'waiting for the server to start' do
       it 'waits until the server has started' do
-        expect(subject).to receive(:up?).exactly(3).times.and_return(false, true)
+        expect(subject).to receive(:up?).exactly(2).times.and_return(false, true)
         subject.start
       end
     end
@@ -101,12 +101,6 @@ describe RabbitMQ::Cluster::Server do
             expect(subject).to_not receive(:"`")
             subject.start
           end
-
-          it 'registers itself' do
-            allow(client).to receive(:overview).and_return('cluster_name' => 'rabbit@this_node')
-            subject.start
-            expect(etcd.nodes).to include('rabbit@this_node')
-          end
         end
 
         it 'tries to join the cluster' do
@@ -183,13 +177,6 @@ describe RabbitMQ::Cluster::Server do
         allow(client).to receive(:overview).and_return("cluster_name" => "rabbit@this_node")
       end
 
-      context 'the node is up' do
-        it 'registers the node' do
-          expect(etcd).to receive(:register).with('rabbit@this_node')
-          subject.synchronize
-        end
-      end
-
       context 'the node is not up' do
         before do
           allow(client).to receive(:aliveness_test).and_return("status" => "agghghghgh")
@@ -228,6 +215,31 @@ describe RabbitMQ::Cluster::Server do
     end
   end
 
+  describe '#healthcheck' do
+    context 'the node is up' do
+      before do
+        allow(client).to receive(:aliveness_test).and_return("status" => "ok")
+        allow(client).to receive(:overview).and_return("cluster_name" => "rabbit@this_node")
+      end
+
+      it 'registers the node' do
+        expect(etcd).to receive(:register).with('rabbit@this_node')
+        subject.healthcheck
+      end
+    end
+
+    context 'the node is down' do
+      before do
+        allow(client).to receive(:aliveness_test).and_return("status" => "i am really broken")
+      end
+
+      it 'registers the node' do
+        expect(etcd).to_not receive(:register)
+        subject.healthcheck
+      end
+    end
+  end
+
 end
 
 class FakeEtcd

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -112,6 +112,7 @@ email:
 - ed.robinson@reevoo.com
 executables:
 - rabbitmq-cluster
+- rabbitmq-cluster-sidekick
 extensions: []
 extra_rdoc_files: []
 files:
@@ -121,6 +122,7 @@ files:
 - README.md
 - Rakefile
 - bin/rabbitmq-cluster
+- bin/rabbitmq-cluster-sidekick
 - lib/rabbitmq/cluster.rb
 - lib/rabbitmq/cluster/etcd.rb
 - lib/rabbitmq/cluster/server.rb
@@ -144,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4354114138756305473
+      hash: -240540097057601169
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4354114138756305473
+      hash: -240540097057601169
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25