big_brother 0.2.0 → 0.2.1

data/lib/big_brother/configuration.rb

@@ -11,19 +11,15 @@ module BigBrother
     end
 
     def self.synchronize_with_ipvs(clusters, ipvs_state)
-      ipvs_state.each do |fwmark, running_nodes|
-        running_cluster = clusters.values.detect { |cluster| cluster.fwmark == fwmark.to_i }
+      clusters.values.each do |cluster|
+        if ipvs_state.has_key?(cluster.fwmark.to_s)
+          cluster.resume_monitoring!
 
-        if running_cluster.nil?
-          BigBrother.ipvs.stop_cluster(fwmark)
-        else
-          running_cluster.resume_monitoring!
+          running_nodes = ipvs_state[cluster.fwmark.to_s]
+          cluster_nodes = cluster.nodes.map(&:address)
 
-          running_nodes = ipvs_state[running_cluster.fwmark.to_s]
-          cluster_nodes = running_cluster.nodes.map(&:address)
-
-          _remove_nodes(running_cluster, running_nodes - cluster_nodes)
-          _add_nodes(running_cluster, cluster_nodes - running_nodes)
+          _remove_nodes(cluster, running_nodes - cluster_nodes)
+          _add_nodes(cluster, cluster_nodes - running_nodes)
         end
       end
     end

data/lib/big_brother/version.rb

@@ -1,3 +1,3 @@
 module BigBrother
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/big_brother/configuration_spec.rb

@@ -77,14 +77,5 @@ describe BigBrother::Configuration do
 
       @recording_executor.commands.should include("ipvsadm --add-server --fwmark-service 1 --real-server 127.0.1.1 --ipip --weight 100")
     end
-
-    it "will remove clusters that are no longer configured" do
-      clusters = { 'two' => Factory.cluster(:fwmark => 2) }
-      ipvs_state = { '1' => ['127.0.0.1'] }
-
-      BigBrother::Configuration.synchronize_with_ipvs(clusters, ipvs_state)
-
-      @recording_executor.commands.should include("ipvsadm --delete-service --fwmark-service 1")
-    end
   end
 end

data/spec/support/recording_executor.rb

@@ -7,6 +7,5 @@ class RecordingExecutor
 
   def invoke(command)
     @commands << command
-    ["", 0]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_brother
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70346477113640 !ruby/object:Gem::Requirement
+  requirement: &70175345459640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70346477113640
+  version_requirements: *70175345459640
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &70346477113100 !ruby/object:Gem::Requirement
+  requirement: &70175345458880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70346477113100
+  version_requirements: *70175345458880
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70346477112480 !ruby/object:Gem::Requirement
+  requirement: &70175345458360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346477112480
+  version_requirements: *70175345458360
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
-  requirement: &70346477111740 !ruby/object:Gem::Requirement
+  requirement: &70175345457700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70346477111740
+  version_requirements: *70175345457700
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70346477111000 !ruby/object:Gem::Requirement
+  requirement: &70175345456980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.0.beta.100
   type: :runtime
   prerelease: false
-  version_requirements: *70346477111000
+  version_requirements: *70175345456980
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70346477109640 !ruby/object:Gem::Requirement
+  requirement: &70175345455800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346477109640
+  version_requirements: *70175345455800
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70346477108780 !ruby/object:Gem::Requirement
+  requirement: &70175345454760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346477108780
+  version_requirements: *70175345454760
 - !ruby/object:Gem::Dependency
   name: em-resolv-replace
-  requirement: &70346477107660 !ruby/object:Gem::Requirement
+  requirement: &70175345453880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70346477107660
+  version_requirements: *70175345453880
 - !ruby/object:Gem::Dependency
   name: em-syslog
-  requirement: &70346477106820 !ruby/object:Gem::Requirement
+  requirement: &70175345452920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70346477106820
+  version_requirements: *70175345452920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346477106340 !ruby/object:Gem::Requirement
+  requirement: &70175345452120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70346477106340
+  version_requirements: *70175345452120
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70346477105760 !ruby/object:Gem::Requirement
+  requirement: &70175345451620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70346477105760
+  version_requirements: *70175345451620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70346477105080 !ruby/object:Gem::Requirement
+  requirement: &70175345451080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346477105080
+  version_requirements: *70175345451080
 - !ruby/object:Gem::Dependency
   name: rake_commit
-  requirement: &70346477104300 !ruby/object:Gem::Requirement
+  requirement: &70175345450240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: '0.13'
   type: :development
   prerelease: false
-  version_requirements: *70346477104300
+  version_requirements: *70175345450240
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70346477103860 !ruby/object:Gem::Requirement
+  requirement: &70175345449640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,7 +167,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346477103860
+  version_requirements: *70175345449640
 description: IPVS backend supervisor
 email:
 - code@getbraintree.com