litmus_paper 0.8.2 → 0.8.3

data/lib/litmus_paper/app.rb

@@ -5,9 +5,10 @@ module LitmusPaper
     get "/" do
       output = "Litmus Paper #{LitmusPaper::VERSION}\n\n"
       output += "Services monitored:\n"
+      output += " Service ( Health / Measured Health )\n"
       LitmusPaper.services.each do |service_name, service|
         health = service.current_health
-        output += "* #{service_name} (#{health.value})"
+        output += "* #{service_name} ( #{health.value} / #{health.measured_health} )"
         if health.forced?
           output += " - forced: #{service.current_health.summary}"
         end
@@ -48,6 +49,9 @@ module LitmusPaper
 
         headers = {"X-Health" => health.value.to_s}
         body = "Health: #{health.value}\n"
+        if health.forced?
+          body << "Measured Health: #{health.measured_health}\n"
+        end
         body << health.summary
 
         if health.forced?

data/lib/litmus_paper/health.rb

@@ -3,10 +3,11 @@ module LitmusPaper
 
     attr_reader :summary
 
-    def initialize
+    def initialize(forced = :none, summary = "")
       @value = 0
       @dependencies_available = true
-      @summary = ""
+      @summary = summary
+      @forced = forced
     end
 
     def ok?
@@ -14,10 +15,18 @@ module LitmusPaper
     end
 
     def forced?
-      false
+      @forced != :none
     end
 
     def value
+      if forced?
+        return @forced == :up ? 100 : 0
+      end
+
+      measured_health
+    end
+
+    def measured_health
       return 0 unless @dependencies_available
       @value
     end

data/lib/litmus_paper/service.rb

@@ -8,9 +8,8 @@ module LitmusPaper
 
     def current_health
       forced_health = _determine_forced_health
-      return forced_health unless forced_health.nil?
 
-      health = LitmusPaper::Health.new
+      health = forced_health ? forced_health : LitmusPaper::Health.new
       @dependencies.each do |dependency|
         health.ensure(dependency)
       end
@@ -35,7 +34,7 @@ module LitmusPaper
 
     def _determine_forced_health
       _health_files.map do |status_file|
-        ForcedHealth.new(status_file.health, status_file.content) if status_file.exists?
+        LitmusPaper::Health.new(status_file.forced, status_file.content) if status_file.exists?
       end.compact.first
     end
   end

data/lib/litmus_paper/status_file.rb

@@ -1,21 +1,21 @@
 module LitmusPaper
   class StatusFile
-    attr_reader :health
+    attr_reader :forced
 
     def self.global_down_file
-      new("global_down", 0)
+      new("global_down", :down)
     end
 
     def self.global_up_file
-      new("global_up", 100)
+      new("global_up", :up)
     end
 
     def self.service_down_file(service_name)
-      new("#{service_name}_down", 0)
+      new("#{service_name}_down", :down)
     end
 
     def self.service_up_file(service_name)
-      new("#{service_name}_up", 100)
+      new("#{service_name}_up", :up)
     end
 
     def self.priority_check_order_for_service(service_name)
@@ -27,13 +27,13 @@ module LitmusPaper
       ]
     end
 
-    def initialize(filename, health)
+    def initialize(filename, forced)
       @path = File.join(LitmusPaper.data_directory, filename)
-      @health = health
+      @forced = forced
     end
 
     def content
-      File.read(@path).chomp
+      File.read(@path).chomp + "\n"
     end
 
     def create(reason)

data/lib/litmus_paper/version.rb

@@ -1,3 +1,3 @@
 module LitmusPaper
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/lib/litmus_paper.rb

@@ -31,7 +31,6 @@ require 'litmus_paper/dependency/http'
 require 'litmus_paper/dependency/script'
 require 'litmus_paper/dependency/tcp'
 require 'litmus_paper/health'
-require 'litmus_paper/forced_health'
 require 'litmus_paper/logger'
 require 'litmus_paper/metric/available_memory'
 require 'litmus_paper/metric/big_brother_service'

data/spec/litmus_paper/app_spec.rb

@@ -35,7 +35,7 @@ describe LitmusPaper::App do
       get "/"
 
       last_response.status.should == 200
-      last_response.body.should include("* test (0)\n")
+      last_response.body.should include("* test ( 0 / 0 )\n")
     end
 
     it "includes the status if forced" do
@@ -48,8 +48,8 @@ describe LitmusPaper::App do
       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")
+      last_response.body.should include("* another ( 0 / 0 ) - forced: Down for testing\n")
+      last_response.body.should include("* test ( 100 / 0 ) - forced: Up for testing\n")
     end
   end
 
@@ -212,8 +212,23 @@ describe LitmusPaper::App do
       last_response.body.should match(/Down for testing/)
     end
 
-    it "is 'service available' when an up file exists" do
-      test_service = LitmusPaper::Service.new('test', [NeverAvailableDependency.new], [LitmusPaper::Metric::ConstantMetric.new(100)])
+    it "still reports the health, dependencies, and metrics when forced down" do
+      test_service = LitmusPaper::Service.new('test', [AlwaysAvailableDependency.new], [LitmusPaper::Metric::ConstantMetric.new(100)])
+      LitmusPaper.services['test'] = test_service
+
+      LitmusPaper::StatusFile.service_down_file("test").create("Down for testing")
+
+      get "/test/status"
+
+      last_response.status.should == 503
+      last_response.headers["X-Health-Forced"].should == "down"
+      last_response.body.should match(/Measured Health: 100\n/)
+      last_response.body.should match(/AlwaysAvailableDependency: OK\n/)
+      last_response.body.should match(/Metric::ConstantMetric\(100\): 100\n/)
+    end
+
+    it "still reports the health, dependencies, and metrics when forced up" do
+      test_service = LitmusPaper::Service.new('test', [AlwaysAvailableDependency.new], [LitmusPaper::Metric::ConstantMetric.new(100)])
       LitmusPaper.services['test'] = test_service
 
       LitmusPaper::StatusFile.service_up_file("test").create("Up for testing")
@@ -222,7 +237,9 @@ describe LitmusPaper::App do
 
       last_response.status.should == 200
       last_response.headers["X-Health-Forced"].should == "up"
-      last_response.body.should match(/Up for testing/)
+      last_response.body.should match(/Measured Health: 100\n/)
+      last_response.body.should match(/AlwaysAvailableDependency: OK\n/)
+      last_response.body.should match(/Metric::ConstantMetric\(100\): 100\n/)
     end
 
     it "is 'service available' when an up file exists" do

data/spec/litmus_paper/service_spec.rb

@@ -26,7 +26,7 @@ describe LitmusPaper::Service do
       LitmusPaper::StatusFile.service_down_file("test").create("Down for testing")
 
       service.current_health.value.should == 0
-      service.current_health.summary.should == "Down for testing"
+      service.current_health.summary.should match(/Down for testing/)
     end
 
     it "is 0 when a global down file exists" do
@@ -37,7 +37,7 @@ describe LitmusPaper::Service do
       LitmusPaper::StatusFile.global_down_file.create("Down for testing")
 
       service.current_health.value.should == 0
-      service.current_health.summary.should == "Down for testing"
+      service.current_health.summary.should match(/Down for testing/)
     end
 
     it "is 100 when an up file exists" do
@@ -48,7 +48,7 @@ describe LitmusPaper::Service do
       LitmusPaper::StatusFile.service_up_file("test").create("Up for testing")
 
       service.current_health.value.should == 100
-      service.current_health.summary.should == "Up for testing"
+      service.current_health.summary.should match(/Up for testing/)
     end
 
     it "is 100 when a global up file exists" do
@@ -59,7 +59,7 @@ describe LitmusPaper::Service do
       LitmusPaper::StatusFile.global_up_file.create("Up for testing")
 
       service.current_health.value.should == 100
-      service.current_health.summary.should == "Up for testing"
+      service.current_health.summary.should match(/Up for testing/)
     end
   end
 end

data/spec/litmus_paper/status_file_spec.rb

@@ -3,23 +3,23 @@ require 'spec_helper'
 describe LitmusPaper::StatusFile do
   describe "create" do
     it "creates a file" do
-      status_file = LitmusPaper::StatusFile.new("foo", 100)
+      status_file = LitmusPaper::StatusFile.new("foo", :up)
       status_file.create("for testing")
 
       status_file.exists?.should == true
     end
 
     it "writes the content" do
-      status_file = LitmusPaper::StatusFile.new("foo", 100)
+      status_file = LitmusPaper::StatusFile.new("foo", :up)
       status_file.create("for testing")
 
-      status_file.content.should == "for testing"
+      status_file.content.should match(/for testing/)
     end
   end
 
   describe "delete" do
     it "removes the file" do
-      status_file = LitmusPaper::StatusFile.new("foo", 100)
+      status_file = LitmusPaper::StatusFile.new("foo", :up)
       status_file.create("for testing")
 
       status_file.exists?.should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: litmus_paper
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -191,7 +191,6 @@ files:
 - lib/litmus_paper/dependency/http.rb
 - lib/litmus_paper/dependency/script.rb
 - lib/litmus_paper/dependency/tcp.rb
-- lib/litmus_paper/forced_health.rb
 - lib/litmus_paper/health.rb
 - lib/litmus_paper/logger.rb
 - lib/litmus_paper/metric/available_memory.rb

data/lib/litmus_paper/forced_health.rb

@@ -1,22 +0,0 @@
-module LitmusPaper
-  class ForcedHealth
-    attr_reader :summary
-
-    def initialize(health, summary)
-      @health = health
-      @summary = summary
-    end
-
-    def value
-      @health
-    end
-
-    def ok?
-      @health > 0
-    end
-
-    def forced?
-      true
-    end
-  end
-end