rabbitmq-cluster 0.0.5 → 0.0.6

data/lib/rabbitmq/cluster/etcd.rb

@@ -21,8 +21,11 @@ module RabbitMQ::Cluster
     end
 
     def register(node_name)
-      key = "/rabbitmq/nodes/#{node_name}"
-      client.set(key, node_name) unless client.exists?(key)
+      client.set(key_for(node_name), node_name) unless client.exists?(key_for(node_name))
+    end
+
+    def deregister(node_name)
+      client.delete(key_for(node_name))
     end
 
     def erlang_cookie
@@ -35,5 +38,11 @@ module RabbitMQ::Cluster
         erlang_cookie
       )
     end
+
+    private
+
+    def key_for(node_name)
+      "/rabbitmq/nodes/#{node_name}"
+    end
   end
 end

data/lib/rabbitmq/cluster/server.rb

@@ -31,7 +31,7 @@ module RabbitMQ::Cluster
       etcd.aquire_lock do
         stopped_nodes.each do |node|
           `rabbitmqctl forget_cluster_node #{node['name']}`
-          etcd.delete("/rabbitmq/nodes/#{node['name']}")
+          etcd.deregister(node['name'])
         end
       end
     end

data/lib/rabbitmq/cluster/version.rb

@@ -1,5 +1,5 @@
 module RabbitMQ
   module Cluster
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/spec/unit/etcd_spec.rb

@@ -55,6 +55,14 @@ describe RabbitMQ::Cluster::Etcd do
     end
   end
 
+  describe '#deregister' do
+    it 'deletes the correct key' do
+      expect(etcd_client).to receive(:delete)
+        .with('/rabbitmq/nodes/rabbit@foobah')
+      subject.deregister('rabbit@foobah')
+    end
+  end
+
   describe '#erlang_cookie' do
     let(:erlang_cookie) { 'afbdgCVB23423bh324h' }
     before do

data/spec/unit/server_spec.rb

@@ -208,7 +208,7 @@ describe RabbitMQ::Cluster::Server do
             {"name" => "rabbit@node2", "running" => false}
           ])
         allow(subject).to receive(:"`")
-        allow(etcd).to receive(:delete)
+        allow(etcd).to receive(:deregister)
       end
 
       it 'aquires the lock before doing anything' do
@@ -223,8 +223,8 @@ describe RabbitMQ::Cluster::Server do
       end
 
       it 'removes the stopped node from etcd' do
-        expect(etcd).to receive(:delete)
-          .with('/rabbitmq/nodes/rabbit@node2')
+        expect(etcd).to receive(:deregister)
+          .with('rabbit@node2')
         subject.synchronize
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3573058060397860240
+      hash: -4211619239378065739
 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: 3573058060397860240
+      hash: -4211619239378065739
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25