big_brother 0.5.0 → 0.6.0

data/lib/big_brother/app.rb

@@ -9,7 +9,7 @@ module BigBrother
 Big Brother: #{BigBrother::VERSION}
 
 Running:
-#{BigBrother.clusters.running.map { |cluster| "+ #{cluster}\n" }.join}
+#{BigBrother.clusters.running.map { |cluster| "+ #{cluster} - CombinedWeight: #{cluster.combined_weight}\n" }.join}
 Stopped:
 #{BigBrother.clusters.stopped.map { |cluster| "- #{cluster}\n" }.join}
       CONTENT
@@ -22,7 +22,7 @@ Stopped:
 
     get "/cluster/:name" do |name|
       @cluster.synchronize! unless @cluster.monitored?
-      [200, "Running: #{@cluster.monitored?}"]
+      [200, "Running: #{@cluster.monitored?}\nCombinedWeight: #{@cluster.combined_weight}\n"]
     end
 
     put "/cluster/:name" do |name|

data/lib/big_brother/cluster.rb

@@ -22,6 +22,10 @@ module BigBrother
       node_config.is_a?(Node) ? node_config : Node.new(node_config)
     end
 
+    def combined_weight
+      nodes.inject(0) { |sum, node| sum + node.weight }
+    end
+
     def downpage_enabled?
       @downpage_enabled
     end

data/lib/big_brother/version.rb

@@ -1,3 +1,3 @@
 module BigBrother
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/big_brother/app_spec.rb

@@ -10,7 +10,10 @@ module BigBrother
       it "returns the list of configured clusters and their status" do
         BigBrother.clusters['one'] = Factory.cluster(:name => 'one', :fwmark => 1)
         BigBrother.clusters['two'] = Factory.cluster(:name => 'two', :fwmark => 2)
-        BigBrother.clusters['three'] = Factory.cluster(:name => 'three', :fwmark => 3)
+        BigBrother.clusters['three'] = Factory.cluster(
+          :name => 'three', :fwmark => 3,
+          :nodes => [Factory.node(:weight => 99)]
+        )
         BigBrother.clusters['three'].start_monitoring!
         BigBrother.clusters['four'] = Factory.cluster(:name => 'four', :fwmark => 4)
 
@@ -19,7 +22,7 @@ module BigBrother
         last_response.body.should include("Big Brother: #{BigBrother::VERSION}")
         last_response.body.should include("- one (1)")
         last_response.body.should include("- two (2)")
-        last_response.body.should include("+ three (3)")
+        last_response.body.should include("+ three (3) - CombinedWeight: 99")
         last_response.body.should include("- four (4)")
       end
     end
@@ -31,17 +34,27 @@ module BigBrother
         get "/cluster/test"
 
         last_response.status.should == 200
-        last_response.body.should == "Running: false"
+        last_response.body.should =~ /^Running: false$/
       end
 
-      it "returns 'Running: true' when the cluster is running" do
-        BigBrother.clusters['test'] = Factory.cluster(:name => 'test')
+      it "returns 'Running: true' and the combined weight when the cluster is running" do
+        BigBrother.clusters['test'] = Factory.cluster(
+          :name => 'test',
+          :nodes => [
+            Factory.node(:weight => 10),
+            Factory.node(:weight => 20),
+            Factory.node(:weight => 30)
+          ]
+        )
 
         put "/cluster/test"
         get "/cluster/test"
 
         last_response.status.should == 200
-        last_response.body.should == "Running: true"
+        last_response.body.should == <<-RESPONSE_BODY
+Running: true
+CombinedWeight: 60
+        RESPONSE_BODY
       end
 
       it "attempts to synchronize the node if it is not running" do
@@ -51,14 +64,14 @@ module BigBrother
 -a -f 1 -r 10.0.1.224:80 -i -w 1
 -A -f 2 -s wrr
 -a -f 2 -r 10.0.1.225:80 -i -w 1
-      OUTPUT
+        OUTPUT
         BigBrother.configure(TEST_CONFIG)
         BigBrother.clusters['test'] = Factory.cluster(:name => 'test', :fwmark => 1)
 
         get "/cluster/test"
 
         last_response.status.should == 200
-        last_response.body.should == "Running: true"
+        last_response.body.should =~ /^Running: true$/
       end
 
       it "returns a 404 http status when the cluster is not found" do

data/spec/big_brother/cluster_spec.rb

@@ -313,4 +313,15 @@ describe BigBrother::Cluster do
       retval.should == config_cluster
     end
   end
+
+  describe "combined_weight" do
+    it "sums the weights of all the nodes in the cluster" do
+      cluster =Factory.cluster(:name => 'test', :nodes => [
+        Factory.node(:weight => 11),
+        Factory.node(:weight => 22),
+        Factory.node(:weight => 33)
+      ])
+      cluster.combined_weight.should == 66
+    end
+  end
 end

data/spec/big_brother/node_spec.rb

@@ -38,7 +38,7 @@ describe BigBrother::Node do
 
     it "sets the weight to 100 for each node if an up file exists" do
       BigBrother::HealthFetcher.stub(:current_health).and_return(56)
-      node = Factory.node(:address => '127.0.0.1')
+      node = Factory.node(:address => '127.0.0.1', :weight => 10)
       cluster = Factory.cluster(:fwmark => 100, :nodes => [node])
       cluster.start_monitoring!
       @stub_executor.commands.clear

data/spec/support/factories/node_factory.rb

@@ -4,7 +4,8 @@ class Factory
       {
         :address => 'localhost',
         :port    => 8081,
-        :path    => '/test/status'
+        :path    => '/test/status',
+        :weight  => 100
       }.merge(overrides)
     )
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_brother
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70176230223860 !ruby/object:Gem::Requirement
+  requirement: &70107762666300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70176230223860
+  version_requirements: *70107762666300
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &70176230223060 !ruby/object:Gem::Requirement
+  requirement: &70107762665540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70176230223060
+  version_requirements: *70107762665540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70176230222360 !ruby/object:Gem::Requirement
+  requirement: &70107762664840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176230222360
+  version_requirements: *70107762664840
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
-  requirement: &70176230221420 !ruby/object:Gem::Requirement
+  requirement: &70107762663740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70176230221420
+  version_requirements: *70107762663740
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70176230220360 !ruby/object:Gem::Requirement
+  requirement: &70107762662860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.0.beta.100
   type: :runtime
   prerelease: false
-  version_requirements: *70176230220360
+  version_requirements: *70107762662860
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70176230219060 !ruby/object:Gem::Requirement
+  requirement: &70107762661360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176230219060
+  version_requirements: *70107762661360
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70176230303940 !ruby/object:Gem::Requirement
+  requirement: &70107762744840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70176230303940
+  version_requirements: *70107762744840
 - !ruby/object:Gem::Dependency
   name: em-resolv-replace
-  requirement: &70176230302240 !ruby/object:Gem::Requirement
+  requirement: &70107762743160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70176230302240
+  version_requirements: *70107762743160
 - !ruby/object:Gem::Dependency
   name: em-syslog
-  requirement: &70176230301680 !ruby/object:Gem::Requirement
+  requirement: &70107762742560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70176230301680
+  version_requirements: *70107762742560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70176230300780 !ruby/object:Gem::Requirement
+  requirement: &70107762741740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70176230300780
+  version_requirements: *70107762741740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70176230300280 !ruby/object:Gem::Requirement
+  requirement: &70107762741240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70176230300280
+  version_requirements: *70107762741240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70176230299880 !ruby/object:Gem::Requirement
+  requirement: &70107762740820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70176230299880
+  version_requirements: *70107762740820
 - !ruby/object:Gem::Dependency
   name: rake_commit
-  requirement: &70176230299300 !ruby/object:Gem::Requirement
+  requirement: &70107762740240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: '0.13'
   type: :development
   prerelease: false
-  version_requirements: *70176230299300
+  version_requirements: *70107762740240
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70176230298860 !ruby/object:Gem::Requirement
+  requirement: &70107762739820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,7 +167,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70176230298860
+  version_requirements: *70107762739820
 description: IPVS backend supervisor
 email:
 - code@getbraintree.com