litmus_paper 0.3.2 → 0.3.3

data/lib/litmus_paper/app.rb

@@ -28,11 +28,10 @@ module LitmusPaper
     end
 
     get "/:service/status" do
-      service = LitmusPaper.services[params[:service]]
-      if service.nil?
+      health = LitmusPaper.check_service(params[:service])
+      if health.nil?
         text 404, "NOT FOUND", { "X-Health" => "0" }
       else
-        health = service.current_health
         response_code = health.ok? ? 200 : 503
         body = "Health: #{health.value}\n"
         body << health.summary

data/lib/litmus_paper/dependency/haproxy_backends.rb

@@ -3,9 +3,10 @@ require 'csv'
 module LitmusPaper
   module Dependency
     class HaproxyBackends
-      def initialize(domain_socket, cluster)
+      def initialize(domain_socket, cluster, options = {})
         @domain_socket = domain_socket
         @cluster = cluster
+        @timeout = options.fetch(:timeout_seconds, 2)
       end
 
       def available?
@@ -15,6 +16,8 @@ module LitmusPaper
         available = servers.select { |s| s['status'] == "UP" }
 
         available.size > 0
+      rescue Timeout::Error
+        false
       end
 
       def to_s
@@ -34,9 +37,11 @@ module LitmusPaper
       end
 
       def _fetch_stats
-        UNIXSocket.open(@domain_socket) do |socket|
-          socket.send "show stat\n", 0
-          socket.read
+        Timeout.timeout(@timeout) do
+          UNIXSocket.open(@domain_socket) do |socket|
+            socket.send "show stat\n", 0
+            socket.read
+          end
         end
       end
     end

data/lib/litmus_paper/dependency/http.rb

@@ -6,6 +6,7 @@ module LitmusPaper
         @expected_content = Regexp.new(options.fetch(:content, '.*'))
         @method = options.fetch(:method, 'GET')
         @ca_file = options[:ca_file]
+        @timeout = options.fetch(:timeout_seconds, 5)
       end
 
       def available?
@@ -28,6 +29,8 @@ module LitmusPaper
         request.set_form_data({})
 
         connection = Net::HTTP.new(uri.host, uri.port)
+        connection.open_timeout = @timeout
+        connection.read_timeout = @timeout
         if uri.scheme == "https"
           connection.use_ssl = true
           connection.verify_mode = OpenSSL::SSL::VERIFY_PEER

data/lib/litmus_paper/dependency/tcp.rb

@@ -1,12 +1,13 @@
 module LitmusPaper
   module Dependency
     class TCP
-      def initialize(ip, port)
+      def initialize(ip, port, options = {})
         @ip, @port = ip, port
+        @timeout = options.fetch(:timeout_seconds, 5)
       end
 
       def available?
-        Timeout.timeout(5) do
+        Timeout.timeout(@timeout) do
           socket = TCPSocket.new(@ip, @port)
           socket.close
         end

data/lib/litmus_paper/service.rb

@@ -6,10 +6,6 @@ module LitmusPaper
       @checks = checks
     end
 
-    def success?
-      health > 0
-    end
-
     def current_health
       forced_health = _determine_forced_health
       return forced_health unless forced_health.nil?

data/lib/litmus_paper/version.rb

@@ -1,3 +1,3 @@
 module LitmusPaper
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/litmus_paper.rb

@@ -32,6 +32,16 @@ module LitmusPaper
 
   self.logger = Logger.new
 
+  def self.check_service(service_name)
+    Facter.flush
+
+    if service = @services[service_name]
+      service.current_health
+    else
+      nil
+    end
+  end
+
   def self.configure(filename)
     @config_file = filename
 

data/litmus_paper.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/litmus_paper/version', __FILE__)
+$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
+require "litmus_paper/version"
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Braintreeps"]

data/spec/litmus_paper/app_spec.rb

@@ -234,6 +234,22 @@ describe LitmusPaper::App do
       last_response.status.should == 200
       last_response.body.should match(/Up for testing/)
     end
+
+    it "resets the Facter cache" do
+      test_service = LitmusPaper::Service.new('test', [AlwaysAvailableDependency.new], [ConstantMetric.new(100)])
+      LitmusPaper.services['test'] = test_service
+
+      get "/test/status"
+      last_response.should be_ok
+
+      facter_uptime = Facter.value("uptime_seconds")
+      sleep 1
+
+      get "/test/status"
+      last_response.should be_ok
+
+      Facter.value("uptime_seconds").should > facter_uptime
+    end
   end
 
   describe "server errors" do

data/spec/litmus_paper/dependency/haproxy_backends_spec.rb

@@ -14,13 +14,27 @@ describe LitmusPaper::Dependency::HaproxyBackends do
       haproxy.should be_available
     end
 
-    it "returns 0 if no nodes are available" do
+    it "returns false if no nodes are available" do
       pending "Broken on TravisCI 1.9.x; works locally" if ENV["TRAVIS_RUBY_VERSION"] =~ /\A1.9/
       haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/tmp/stub-haproxy-stats", "orange_cluster")
       haproxy.should_not be_available
     end
   end
 
+  describe "timeouts" do
+    before(:each) do
+      FileUtils.rm_rf("/tmp/stub-haproxy-stats")
+      system "spec/support/haproxy_test_socket /tmp/stub-haproxy-stats 3 &"
+      sleep 1
+    end
+
+    it "returns false after a configurable number of seconds" do
+      pending "Broken on TravisCI 1.9.x; works locally" if ENV["TRAVIS_RUBY_VERSION"] =~ /\A1.9/
+      haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/tmp/stub-haproxy-stats", "yellow_cluster", :timeout_seconds => 1)
+      haproxy.should_not be_available
+    end
+  end
+
   describe "to_s" do
     it "includes the socket file and the cluster" do
       haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/tmp/stub-haproxy-stats", "orange_cluster")

data/spec/litmus_paper/dependency/http_spec.rb

@@ -75,6 +75,11 @@ describe LitmusPaper::Dependency::HTTP do
       check = LitmusPaper::Dependency::HTTP.new('http://127.0.0.1:7777')
       check.should_not be_available
     end
+
+    it "is false when the request times out" do
+      check = LitmusPaper::Dependency::HTTP.new("#{@url}/sleep/2", :timeout_seconds => 1)
+      check.should_not be_available
+    end
   end
 
   describe "to_s" do

data/spec/support/haproxy_test_socket

@@ -2,9 +2,15 @@
 
 require 'socket'
 
+socket_file, sleep_time = ARGV
+sleep_time ||= 0.1
+sleep_time = sleep_time.to_f
+
 UNIXServer.open(ARGV[0]) do |server|
   socket = server.accept
-  socket.puts <<-DATA
+  sleep sleep_time
+  begin
+    socket.puts <<-DATA
 # pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,
 stats,FRONTEND,,,0,0,2000,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,1,0,,,,0,0,0,0,,,,0,0,0,0,0,0,,0,0,0,,,
 stats_backend,BACKEND,0,0,0,0,0,0,0,0,0,0,,0,0,0,0,UP,0,0,0,,0,35,0,,1,2,0,,0,,1,0,,0,,,,0,0,0,0,0,0,,,,,0,0,
@@ -18,5 +24,8 @@ orange_cluster,orange1,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,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,,2,0,,0,L4OK,,5,,,,,,,0,,,,0,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
+    socket.close
+  rescue Errno::EINVAL
+    # client closed connection because of timeout
+  end
 end

data/spec/support/http_test_server.rb

@@ -19,6 +19,12 @@ class HttpTestServer < Sinatra::Base
     end
   end
 
+  get "/sleep/:seconds" do
+    sleep params[:seconds].to_f
+    $stderr.puts "sleeping #{params[:seconds]}"
+    text 200, "Woke up after #{params.inspect} seconds"
+  end
+
   def text(response_code, body, headers ={})
     [response_code, { "Content-Type" => "text/plain" }.merge(headers), body]
   end

metadata

@@ -1,102 +1,146 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: litmus_paper
-version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 3
+  version: 0.3.3
 platform: ruby
-authors:
+authors: 
 - Braintreeps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-26 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &70248649019060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
   type: :runtime
-  prerelease: false
-  version_requirements: *70248649019060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: facter
-  requirement: &70248649000380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 6
+        - 7
         version: 1.6.7
   type: :runtime
-  prerelease: false
-  version_requirements: *70248649000380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: SyslogLogger
-  requirement: &70248648925460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
   type: :runtime
-  prerelease: false
-  version_requirements: *70248648925460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70248644644480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 2
+        - 9
+        - 0
         version: 2.9.0
   type: :development
-  prerelease: false
-  version_requirements: *70248644644480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &70248644537640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
   type: :development
-  prerelease: false
-  version_requirements: *70248644537640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70248644543240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 9
+        - 2
+        - 2
         version: 0.9.2.2
   type: :development
-  prerelease: false
-  version_requirements: *70248644543240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rake_commit
-  requirement: &70248644542440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.13'
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 13
+        version: "0.13"
   type: :development
-  prerelease: false
-  version_requirements: *70248644542440
+  version_requirements: *id007
 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
@@ -155,31 +199,41 @@ files:
 - spec/support/stub_facter.rb
 - spec/support/test.config
 - spec/support/test.d.config
+has_rdoc: true
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 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