litmus_paper 0.6.1 → 0.6.2

data/lib/litmus_paper/app.rb

@@ -4,7 +4,11 @@ module LitmusPaper
       output = "Litmus Paper #{LitmusPaper::VERSION}\n\n"
       output += "Services monitored:\n"
       LitmusPaper.services.each do |service_name, service|
-        output += "* #{service_name} (#{service.current_health.value})\n"
+        output += "* #{service_name} (#{service.current_health.value})"
+        if service.current_health.forced?
+          output += " - forced: #{service.current_health.summary}"
+        end
+        output += "\n"
       end
 
       _text 200, output
@@ -31,10 +35,23 @@ module LitmusPaper
       if health.nil?
         _text 404, "NOT FOUND", { "X-Health" => "0" }
       else
-        response_code = health.ok? ? 200 : 503
+        if health.ok?
+          response_code = 200
+          status = "up"
+        else
+          response_code = 503
+          status = "down"
+        end
+
+        headers = {"X-Health" => health.value.to_s}
         body = "Health: #{health.value}\n"
         body << health.summary
-        _text response_code, body, { "X-Health" => health.value.to_s }
+
+        if health.forced?
+          headers["X-Health-Forced"] = status
+        end
+
+        _text response_code, body, headers
       end
     end
 

data/lib/litmus_paper/forced_health.rb

@@ -14,5 +14,9 @@ module LitmusPaper
     def ok?
       @health > 0
     end
+
+    def forced?
+      true
+    end
   end
 end

data/lib/litmus_paper/health.rb

@@ -13,6 +13,10 @@ module LitmusPaper
       value > 0
     end
 
+    def forced?
+      false
+    end
+
     def value
       return 0 unless @dependencies_available
       @value

data/lib/litmus_paper/version.rb

@@ -1,3 +1,3 @@
 module LitmusPaper
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/litmus_paper/app_spec.rb

@@ -33,6 +33,20 @@ describe LitmusPaper::App do
       last_response.status.should == 200
       last_response.body.should include("* test (0)\n")
     end
+
+    it "includes the status if forced" do
+      LitmusPaper.services['test'] = LitmusPaper::Service.new('test')
+      LitmusPaper.services['another'] = LitmusPaper::Service.new('another')
+
+      LitmusPaper::StatusFile.service_up_file("test").create("Up for testing")
+      LitmusPaper::StatusFile.service_down_file("another").create("Down for testing")
+
+      get "/"
+
+      last_response.status.should == 200
+      last_response.body.should include("* another (0) - forced: Down for testing\n")
+      last_response.body.should include("* test (100) - forced: Up for testing\n")
+    end
   end
 
   describe "POST /up" do
@@ -155,6 +169,7 @@ describe LitmusPaper::App do
       last_response.should be_ok
       last_response.header["Content-Type"].should == "text/plain"
       last_response.header["X-Health"].should == "100"
+      last_response.header.should_not have_key("X-Health-Forced")
       last_response.body.should match(/Health: 100/)
       last_response.body.should match(/AlwaysAvailableDependency: OK/)
       last_response.body.should include("ConstantMetric(100): 100")
@@ -189,6 +204,7 @@ describe LitmusPaper::App do
       get "/test/status"
 
       last_response.status.should == 503
+      last_response.headers["X-Health-Forced"].should == "down"
       last_response.body.should match(/Down for testing/)
     end
 
@@ -201,6 +217,7 @@ describe LitmusPaper::App do
       get "/test/status"
 
       last_response.status.should == 200
+      last_response.headers["X-Health-Forced"].should == "up"
       last_response.body.should match(/Up for testing/)
     end
 
@@ -213,6 +230,7 @@ describe LitmusPaper::App do
       get "/test/status"
 
       last_response.status.should == 200
+      last_response.headers["X-Health-Forced"].should == "up"
       last_response.body.should match(/Up for testing/)
     end
 
@@ -226,6 +244,7 @@ describe LitmusPaper::App do
       get "/test/status"
 
       last_response.status.should == 503
+      last_response.headers["X-Health-Forced"].should == "down"
       last_response.body.should match(/Down for testing/)
     end
 
@@ -238,6 +257,7 @@ describe LitmusPaper::App do
       get "/test/status"
 
       last_response.status.should == 503
+      last_response.headers["X-Health-Forced"].should == "down"
       last_response.body.should match(/Down for testing/)
     end
 
@@ -250,6 +270,7 @@ describe LitmusPaper::App do
       get "/test/status"
 
       last_response.status.should == 200
+      last_response.headers["X-Health-Forced"].should == "up"
       last_response.body.should match(/Up for testing/)
     end
 

data/spec/support/haproxy_test_socket

@@ -25,6 +25,8 @@ orange_cluster,orange2,0,0,0,0,,0,0,0,,0,,0,0,0,0,DOWN,1,1,0,0,0,35,0,,1,6,1,,0,
 orange_cluster,BACKEND,0,0,0,0,0,0,0,0,0,0,,0,0,0,0,DOWN,1,1,0,,0,35,0,,1,6,0,,0,,1,0,,0,,,,,,,,,,,,,,0,0,
 DATA
     socket.close
+  rescue Errno::EPIPE
+    # client closed the connection before we got to write
   rescue Errno::EINVAL
     # client closed connection because of timeout
   end

metadata

@@ -1,145 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: litmus_paper
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.6.2
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
 platform: ruby
-authors: 
+authors:
 - Braintreeps
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: facter
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 6
-        - 7
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: facter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: SyslogLogger
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: SyslogLogger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake_commit
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: rake_commit
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 13
-        version: "0.13"
+      - !ruby/object:Gem::Version
+        version: '0.13'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.13'
 description: Backend health tester for HA Services
-email: 
+email:
 - code@getbraintree.com
-executables: 
+executables:
 - litmus
 - litmusctl
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rake_commit
 - .rvmrc
@@ -206,38 +198,29 @@ files:
 - spec/support/test.d.config
 homepage: https://github.com/braintree/litmus_paper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Backend health tester for HA Services, partner project of big_brother
-test_files: 
+test_files:
 - spec/litmus_paper/app_spec.rb
 - spec/litmus_paper/cli/admin_spec.rb
 - spec/litmus_paper/cli/server_spec.rb