big_brother 0.6.4 → 0.6.5

data/lib/big_brother/cluster.rb

@@ -1,12 +1,11 @@
 module BigBrother
   class Cluster
-    attr_reader :fwmark, :scheduler, :check_interval, :nodes, :name, :persistent, :ramp_up_time, :nagios
+    attr_reader :fwmark, :scheduler, :check_interval, :nodes, :name, :ramp_up_time, :nagios
 
     def initialize(name, attributes = {})
       @name = name
       @fwmark = attributes[:fwmark]
       @scheduler = attributes[:scheduler]
-      @persistent = attributes.fetch(:persistent, 300)
       @check_interval = attributes.fetch(:check_interval, 1)
       @monitored = false
       @nodes = attributes.fetch(:nodes, []).map { |node_config| _coerce_node(node_config) }
@@ -44,7 +43,7 @@ module BigBrother
 
     def start_monitoring!
       BigBrother.logger.info "starting monitoring on cluster #{to_s}"
-      BigBrother.ipvs.start_cluster(@fwmark, @scheduler, @persistent)
+      BigBrother.ipvs.start_cluster(@fwmark, @scheduler)
       @nodes.each do |node|
         BigBrother.ipvs.start_node(@fwmark, node.address, 100)
       end

data/lib/big_brother/ipvs.rb

@@ -4,8 +4,8 @@ module BigBrother
       @executor = executor
     end
 
-    def start_cluster(fwmark, scheduler, persistent)
-      @executor.invoke("ipvsadm --add-service --fwmark-service #{fwmark} --scheduler #{scheduler} --persistent #{persistent}")
+    def start_cluster(fwmark, scheduler)
+      @executor.invoke("ipvsadm --add-service --fwmark-service #{fwmark} --scheduler #{scheduler}")
     end
 
     def stop_cluster(fwmark)

data/lib/big_brother/version.rb

@@ -1,3 +1,3 @@
 module BigBrother
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/spec/big_brother/app_spec.rb

@@ -168,7 +168,7 @@ CombinedWeight: 60
         last_response.status.should == 200
         last_response.body.should == "OK"
         BigBrother.clusters['test'].should be_monitored
-        @stub_executor.commands.should include("ipvsadm --add-service --fwmark-service 100 --scheduler wrr --persistent 300")
+        @stub_executor.commands.should include("ipvsadm --add-service --fwmark-service 100 --scheduler wrr")
         @stub_executor.commands.should include("ipvsadm --add-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 100")
         @stub_executor.commands.should include("ipvsadm --add-server --fwmark-service 100 --real-server 127.0.0.2 --ipip --weight 100")
       end

data/spec/big_brother/cluster_spec.rb

@@ -13,7 +13,7 @@ describe BigBrother::Cluster do
       cluster = Factory.cluster(:fwmark => 100, :scheduler => 'wrr')
 
       cluster.start_monitoring!
-      @stub_executor.commands.should include('ipvsadm --add-service --fwmark-service 100 --scheduler wrr --persistent 300')
+      @stub_executor.commands.should include('ipvsadm --add-service --fwmark-service 100 --scheduler wrr')
     end
   end
 

data/spec/big_brother/configuration_spec.rb

@@ -8,7 +8,6 @@ describe BigBrother::Configuration do
       clusters['test1'].check_interval.should == 1
       clusters['test1'].scheduler.should == 'wrr'
       clusters['test1'].fwmark.should == 1
-      clusters['test1'].persistent.should == 20
       clusters['test1'].ramp_up_time.should == 120
       clusters['test1'].has_downpage?.should == true
       clusters['test1'].nagios[:check].should == 'test1_status'

data/spec/support/example_config.yml

@@ -3,7 +3,6 @@ test1:
   check_interval: 1
   scheduler: wrr
   fwmark: 1
-  persistent: 20
   ramp_up_time: 120
   has_downpage: true
   nagios:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_brother
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402245100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+  version_requirements: *70140402245100
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402244360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+  version_requirements: *70140402244360
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402243120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *70140402243120
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402242640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+  version_requirements: *70140402242640
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402242100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *70140402242100
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402257780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *70140402257780
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402256860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  version_requirements: *70140402256860
 - !ruby/object:Gem::Dependency
   name: em-resolv-replace
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402255780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +98,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+  version_requirements: *70140402255780
 - !ruby/object:Gem::Dependency
   name: em-syslog
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402254800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,15 +109,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
+  version_requirements: *70140402254800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402254220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,15 +120,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+  version_requirements: *70140402254220
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402253600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -181,15 +131,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+  version_requirements: *70140402253600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402253060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,15 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140402253060
 - !ruby/object:Gem::Dependency
   name: rake_commit
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402252280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -213,15 +153,10 @@ dependencies:
         version: '0.13'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.13'
+  version_requirements: *70140402252280
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70140402251660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -229,12 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70140402251660
 description: IPVS backend supervisor
 email:
 - code@getbraintree.com
@@ -307,21 +237,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4040566039052582220
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4040566039052582220
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Process to monitor and update weights for servers in an IPVS pool