litmus_paper 0.8.5 → 0.8.6

data/lib/litmus_paper.rb

@@ -4,6 +4,7 @@ require 'net/https'
 require 'uri'
 require 'forwardable'
 require 'English'
+require 'colorize'
 
 # Ruby's stock DNS resolution, by default, blocks the entire Ruby VM from
 # processing while the lookup is happening, because it calls out to the native
@@ -38,6 +39,7 @@ require 'litmus_paper/metric/constant_metric'
 require 'litmus_paper/metric/cpu_load'
 require 'litmus_paper/service'
 require 'litmus_paper/status_file'
+require 'litmus_paper/terminal_output'
 require 'litmus_paper/version'
 
 module LitmusPaper

data/lib/litmus_paper/app.rb

@@ -3,20 +3,7 @@ module LitmusPaper
     disable :show_exceptions
 
     get "/" do
-      output = "Litmus Paper #{LitmusPaper::VERSION}\n"
-      max_service_length = (LitmusPaper.services.keys << "Service").max { |a, b| a.length <=> b.length }.length
-      output += sprintf "  %-#{max_service_length}s %6s [%s] [%s]\n", "", "", "Measured", "Forced"
-      output += sprintf "  %-#{max_service_length}s %6s [%s] [%s]\n", "Service", "Health", "Health".center(8), "Reason"
-      LitmusPaper.services.each do |service_name, service|
-        health = service.current_health
-        output += sprintf "* %-#{max_service_length}s %6s", service_name, health.value
-        if health.forced?
-          output += sprintf " %10s %s", health.measured_health, service.current_health.forced_reason
-        end
-        output += "\n"
-      end
-
-      _text 200, output
+      _text 200, LitmusPaper::TerminalOutput.service_status
     end
 
     delete "/down" do

data/lib/litmus_paper/dependency/file_contents.rb

@@ -19,7 +19,7 @@ module LitmusPaper
       rescue Timeout::Error
         LitmusPaper.logger.info("Timeout reading #{@path}")
         false
-      rescue Exception => e
+      rescue => e
         LitmusPaper.logger.info("Error reading #{@path}: '#{e.message}'")
         false
       end

data/lib/litmus_paper/dependency/haproxy_backends.rb

@@ -14,12 +14,15 @@ module LitmusPaper
         backend = _find_backend(stats, @cluster)
 
         if backend['status'] != 'UP'
-          LitmusPaper.logger.info("HAproxy available check failed, #{@cluster} backend is #{backend['status']}")
+          LitmusPaper.logger.info("HAProxy available check failed, #{@cluster} backend is #{backend['status']}")
           return false
         end
         return true
       rescue Timeout::Error
-        LitmusPaper.logger.info("HAproxy available check timed out for #{@cluster}")
+        LitmusPaper.logger.info("HAProxy available check timed out for #{@cluster}")
+        false
+      rescue => e
+        LitmusPaper.logger.info("HAProxy available check failed for #{@cluster} with #{e.message}")
         false
       end
 

data/lib/litmus_paper/dependency/http.rb

@@ -18,7 +18,10 @@ module LitmusPaper
         LitmusPaper.logger.info("Available check to #{@uri} did not match #{@expected_content}") unless matches
 
         success && matches
-      rescue Exception => e
+      rescue Timeout::Error
+        LitmusPaper.logger.info("Timeout fetching #{@uri}")
+        false
+      rescue => e
         LitmusPaper.logger.info("Available check to #{@uri} failed with #{e.message}")
         false
       end

data/lib/litmus_paper/dependency/script.rb

@@ -24,9 +24,12 @@ module LitmusPaper
           script_status.success?
         end
       rescue Timeout::Error
-        LitmusPaper.logger.info("Available check to '#{@command}' timed out")
+        LitmusPaper.logger.info("Timeout running command: '#{@command}'")
         kill_and_reap_script(@script_pid)
         false
+      rescue => e
+        LitmusPaper.logger.info("Available check to #{@uri} failed with #{e.message}")
+        false
       end
 
       def kill_and_reap_script(pid)

data/lib/litmus_paper/dependency/tcp.rb

@@ -12,7 +12,10 @@ module LitmusPaper
           socket.close
         end
         true
-      rescue Exception => e
+      rescue Timeout::Error
+        LitmusPaper.logger.info("Timeout connecting #{@ip}:#{@port}")
+        false
+      rescue => e
         LitmusPaper.logger.info("TCP available check to #{@ip}:#{@port} failed with #{e.message}")
         false
       end

data/lib/litmus_paper/terminal_output.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+module LitmusPaper
+  class TerminalOutput
+    def self.service_status
+      max_service_length = (LitmusPaper.services.keys << "Service").max { |a, b| a.length <=> b.length }.length
+
+      output = "Litmus Paper #{LitmusPaper::VERSION}\n"
+      output += sprintf(" %s │ %s │ %s │ %s\n", "Service".ljust(max_service_length), "Reported", "Measured", "Health")
+      output += sprintf(" %s │ %s │ %s │ %s\n", "Name".ljust(max_service_length), "Health".ljust(8), "Health".ljust(8), "Forced?")
+      output += "─" * (max_service_length + 2) + "┴" + "─" * 10 + "┴" + "─" * 10 + "┴" + "─" * 9 + "\n"
+
+      LitmusPaper.services.each do |service_name, service|
+        health = service.current_health
+        measured_health = health.measured_health.to_s.rjust(3)
+        reported_health = health.value.to_s.rjust(3)
+        service_forced = if health.forced?
+          "Yes: #{health.forced_reason}"
+        else
+          "No"
+        end
+        output += sprintf("* %-#{max_service_length}s   %s   %s   %s\n",
+                          service_name,
+                          reported_health.center(8).colorize(_health_color(health.value)),
+                          measured_health.center(8),
+                          service_forced,
+                         )
+      end
+
+      return output
+    end
+
+    def self._health_color(health)
+      if health == 0
+        return :red
+      elsif health < 80
+        return :yellow
+      else
+        return :green
+      end
+    end
+
+  end
+end

data/lib/litmus_paper/version.rb

@@ -1,3 +1,3 @@
 module LitmusPaper
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/litmus_paper.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "remote_syslog_logger", "~> 1.0.3"
   gem.add_dependency "popen4", "~> 0.1.2"
   gem.add_dependency "unicorn", "~> 4.6.2"
+  gem.add_dependency "colorize"
 
   gem.add_development_dependency "rspec", "~> 2.9.0"
   gem.add_development_dependency "rack-test", "~> 0.6.1"

data/spec/litmus_paper/app_spec.rb

@@ -35,7 +35,8 @@ describe LitmusPaper::App do
       get "/"
 
       last_response.status.should == 200
-      last_response.body.should match(/\* test +0\n/)
+      last_response.body.should include('test')
+      last_response.body.should include('0')
     end
 
     it "includes the status if forced" do
@@ -48,8 +49,8 @@ describe LitmusPaper::App do
       get "/"
 
       last_response.status.should == 200
-      last_response.body.should match(/\* another +0 +0 +Down for testing\n/)
-      last_response.body.should match(/\* test +100 +0 +Up for testing\n/)
+      last_response.body.should include('Down for testing')
+      last_response.body.should include('Up for testing')
     end
   end
 

data/spec/litmus_paper/dependency/file_contents_spec.rb

@@ -21,6 +21,12 @@ describe LitmusPaper::Dependency::FileContents do
       check = LitmusPaper::Dependency::FileContents.new("/dev/zero", /^timeout$/, :timeout => 1)
       check.should_not be_available
     end
+
+    it "logs exceptions and returns false" do
+      check = LitmusPaper::Dependency::FileContents.new("/tmp/this_file_does_not_exist", /^foo$/)
+      LitmusPaper.logger.should_receive(:info)
+      check.should_not be_available
+    end
   end
 
   describe "to_s" do

data/spec/litmus_paper/dependency/haproxy_backends_spec.rb

@@ -17,6 +17,12 @@ describe LitmusPaper::Dependency::HaproxyBackends do
       haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/tmp/stub-haproxy-stats", "orange_cluster")
       haproxy.should_not be_available
     end
+
+    it "logs exceptions and returns false" do
+      haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/dev/null", "yellow_cluster")
+      LitmusPaper.logger.should_receive(:info)
+      haproxy.should_not be_available
+    end
   end
 
   describe "timeouts" do

data/spec/litmus_paper/dependency/http_spec.rb

@@ -124,6 +124,12 @@ describe LitmusPaper::Dependency::HTTP do
       check = LitmusPaper::Dependency::HTTP.new("#{@url}/sleep/2", :timeout_seconds => 1)
       check.should_not be_available
     end
+
+    it "logs exceptions and returns false" do
+      check = LitmusPaper::Dependency::HTTP.new('http://127.0.0.1:7777')
+      LitmusPaper.logger.should_receive(:info)
+      check.should_not be_available
+    end
   end
 
   describe "to_s" do

data/spec/litmus_paper/dependency/script_spec.rb

@@ -30,6 +30,12 @@ describe LitmusPaper::Dependency::Script do
       check = LitmusPaper::Dependency::Script.new("ls | grep missing")
       check.should_not be_available
     end
+
+    it "logs exceptions and returns false" do
+      check = LitmusPaper::Dependency::Script.new("command_not_found")
+      LitmusPaper.logger.should_receive(:info)
+      check.should_not be_available
+    end
   end
 
   describe "to_s" do

data/spec/litmus_paper/dependency/tcp_spec.rb

@@ -24,6 +24,20 @@ describe LitmusPaper::Dependency::TCP do
       check = LitmusPaper::Dependency::TCP.new("127.0.0.1", 3334)
       check.should_not be_available
     end
+
+    it "is false when the request times out" do
+      TCPSocket.stub(:new) do
+        sleep(5)
+      end
+      check = LitmusPaper::Dependency::TCP.new("127.0.0.1", 3334, :timeout_seconds => 1)
+      check.should_not be_available
+    end
+
+    it "logs exceptions and returns false" do
+      check = LitmusPaper::Dependency::TCP.new("127.0.0.1", 3334)
+      LitmusPaper.logger.should_receive(:info)
+      check.should_not be_available
+    end
   end
 
   describe "to_s" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: litmus_paper
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.6.2
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +215,7 @@ files:
 - lib/litmus_paper/metric/cpu_load.rb
 - lib/litmus_paper/service.rb
 - lib/litmus_paper/status_file.rb
+- lib/litmus_paper/terminal_output.rb
 - lib/litmus_paper/version.rb
 - litmus_paper.gemspec
 - spec/litmus_paper/app_spec.rb
@@ -254,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Backend health tester for HA Services, partner project of big_brother