litmus_paper 0.2.2 → 0.3.0

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p0@litmus_paper --create
+rvm use ruby-1.8.7-p249@litmus_paper --create

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - 1.8.7
   - 1.9.2
   - 1.9.3

data/bin/litmusctl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
-require 'net/http'
+require 'litmus_paper'
 require 'litmus_paper/cli/admin'
 
 LitmusPaper::CLI::Admin.new.run

data/lib/litmus_paper/app.rb

@@ -1,9 +1,5 @@
 module LitmusPaper
   class App < Sinatra::Base
-    register Sinatra::Synchrony
-    set :dump_errors, true
-    set :raise_errors, false
-
     get "/" do
       output = "Services monitored:\n"
       output +=  LitmusPaper.services.keys.join("\n")
@@ -48,7 +44,7 @@ module LitmusPaper
     end
 
     error do
-      text 500, "Server Error: " + env['sinatra.error'].message
+      text 500, "Server Error"
     end
 
     def text(response_code, body, headers ={})

data/lib/litmus_paper/cli/server.rb

@@ -6,7 +6,7 @@ module LitmusPaper
           args, options = args.dup, {}
 
           opt_parser = OptionParser.new do |opts|
-            opts.banner = "Usage: litmus [options]"
+            opts.banner = "Usage: litmus [mongrel, thin, etc] [options]"
             opts.on("-c", "--config=file", String,
                     "Litmus configuration file", "Default: /etc/litmus.conf") { |v| options[:litmus_config] = v }
             opts.on("-D", "--data-dir=path", String,
@@ -31,8 +31,7 @@ module LitmusPaper
           opt_parser.parse! args
 
           options[:config] = File.expand_path("../../../config.ru", File.dirname(__FILE__))
-          options[:server] = 'thin-with-callbacks'
-          options[:backend] = Thin::Backends::TcpServerWithCallbacks
+          options[:server] = args.shift
           options
         end
       end
@@ -47,13 +46,8 @@ module LitmusPaper
           exit 1
         end
 
-        LitmusPaper.config_file = options[:litmus_config]
+        LitmusPaper.configure(options[:litmus_config])
         LitmusPaper.config_dir = options[:config_dir]
-
-        Thin::Callbacks.after_connect do
-          LitmusPaper.configure!
-        end
-
         super
       end
 

data/lib/litmus_paper/dependency/haproxy_backends.rb

@@ -3,27 +3,6 @@ require 'csv'
 module LitmusPaper
   module Dependency
     class HaproxyBackends
-
-      module HaproxyStatReader
-        def initialize(fiber)
-          @fiber = fiber
-          @stats = ""
-        end
-
-        def connection_completed
-          send_data("show stat\n")
-        end
-
-        def receive_data(data)
-          @stats << data
-          @fiber.resume(@stats) if finished?
-        end
-
-        def finished?
-          @stats =~ /\n\n\z/
-        end
-      end
-
       def initialize(domain_socket, cluster)
         @domain_socket = domain_socket
         @cluster = cluster
@@ -31,18 +10,10 @@ module LitmusPaper
 
       def available?
         stats = _parse_stats(_fetch_stats)
-        servers = _servers_in(stats, @cluster)
 
-        if not _any_up?(servers)
-          LitmusPaper.logger.info("None of the servers (#{servers.map{ |s| s['svname'] }.join(',')}) are up")
-          false
-        else
-          true
-        end
-      end
-
-      def _any_up?(servers)
+        servers = _servers_in(stats, @cluster)
         available = servers.select { |s| s['status'] == "UP" }
+
         available.size > 0
       end
 
@@ -53,17 +24,16 @@ module LitmusPaper
       end
 
       def _parse_stats(csv)
-        stats = CSV.parse(_fetch_stats)
+        stats = CSV.parse(csv)
         headers = stats.shift
         stats.map { |stat| Hash[headers.zip(stat)] }
       end
 
       def _fetch_stats
-        fiber = Fiber.current
-
-        connection = EM.connect_unix_domain(@domain_socket, HaproxyStatReader, fiber)
-
-        Fiber.yield
+        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

@@ -1,12 +1,10 @@
 module LitmusPaper
   module Dependency
     class HTTP
-      VALID_RESPONSE_CODES = (200..399).freeze
-
       def initialize(uri, options = {})
         @uri = uri
         @expected_content = Regexp.new(options.fetch(:content, '.*'))
-        @method = options.fetch(:method, 'get')
+        @method = options.fetch(:method, 'GET')
         @ca_file = options[:ca_file]
       end
 
@@ -15,7 +13,7 @@ module LitmusPaper
         success = _successful_response?(response)
         matches = _body_matches?(response)
 
-        LitmusPaper.logger.info("Available check to #{@uri} failed with status #{response.response_header.status}") unless success
+        LitmusPaper.logger.info("Available check to #{@uri} failed with status #{response.code}") unless success
         LitmusPaper.logger.info("Available check to #{@uri} did not match #{@expected_content}") unless matches
 
         success && matches
@@ -26,18 +24,28 @@ module LitmusPaper
 
       def _make_request
         uri = URI.parse(@uri)
-        request_options = {}
-        request_options[:ssl] = {:verify_peer => true, :cert_chain_file => @ca_file} if uri.scheme == "https"
+        request = Net::HTTP.const_get(@method.capitalize).new(uri.normalize.path)
+        request.set_form_data({})
+
+        connection = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == "https"
+          connection.use_ssl = true
+          connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          connection.ca_file = @ca_file unless @ca_file.nil?
+          connection.verify_callback = proc { |preverify_ok, ssl_context| _verify_ssl_certificate(preverify_ok, ssl_context) }
+        end
 
-        EM::HttpRequest.new(@uri).send(@method.downcase, request_options)
+        connection.start do |http|
+          http.request(request)
+        end
       end
 
       def _successful_response?(response)
-        VALID_RESPONSE_CODES.include? response.response_header.status
+        response.is_a? Net::HTTPSuccess
       end
 
       def _body_matches?(response)
-        (response.response =~ @expected_content) ? true : false
+        (response.body =~ @expected_content) ? true : false
       end
 
       def _verify_ssl_certificate(preverify_ok, ssl_context)

data/lib/litmus_paper/dependency/tcp.rb

@@ -1,39 +1,18 @@
 module LitmusPaper
   module Dependency
     class TCP
-      class EndpointAvailable < EM::Connection
-        def initialize(fiber, timeout, ip, port)
-          @fiber = fiber
-          @ip = ip
-          @port = port
-          @timer = EM::Timer.new(timeout, method(:connection_timeout))
-        end
-
-        def connection_completed
-          close_connection
-          @timer.cancel
-          @fiber.resume(true)
-        end
-
-        def connection_timeout
-          LitmusPaper.logger.info("Available check to #{@ip}:#{@port} failed with a timeout")
-          @fiber.resume(false)
-        end
-      end
-
-      def initialize(ip, port, options = {})
+      def initialize(ip, port)
         @ip, @port = ip, port
-        @timeout = options.fetch(:timeout, 2)
       end
 
       def available?
-        fiber = Fiber.current
-
-        EM.connect(@ip, @port, EndpointAvailable, fiber, @timeout, @ip, @port) do |connection|
-          connection.set_pending_connect_timeout @timeout
+        Timeout.timeout(5) do
+          socket = TCPSocket.new(@ip, @port)
+          socket.close
         end
-
-        return Fiber.yield
+        true
+      rescue Exception
+        false
       end
 
       def to_s

data/lib/litmus_paper/logger.rb

@@ -1,15 +1,15 @@
 module LitmusPaper
   class Logger
     extend Forwardable
-    def_delegators :EM, :debug, :info
+    def_delegators :@syslog, :debug, :info
 
-    def write(message)
-      info(message)
+    def initialize
+      @syslog = SyslogLogger.new("litmus_paper")
     end
 
-    def setup!
-      # @file = File.open("/tmp/error", "w")
-      EM.syslog_setup('0.0.0.0', 514)
+    def write(message)
+      @syslog.info(message)
     end
+
   end
 end

data/lib/litmus_paper/metric/available_memory.rb

@@ -7,7 +7,7 @@ module LitmusPaper
         "KB" => 1024
       }
 
-      def initialize(weight, facter = DeferredFacter)
+      def initialize(weight, facter = Facter)
         @weight = weight
         @facter = facter
       end
@@ -20,12 +20,12 @@ module LitmusPaper
         return @memory_total unless @memory_total.nil?
 
         size, scale = @facter.value('memorytotal').split(' ')
-        @memory_total = (size.to_f * MULTIPLIER[scale]).to_i
+        @memory_total = size.to_i * MULTIPLIER[scale]
       end
 
       def memory_free
         size, scale = @facter.value('memoryfree').split(' ')
-        (size.to_f * MULTIPLIER[scale]).to_i
+        size.to_i * MULTIPLIER[scale]
       end
 
       def to_s

data/lib/litmus_paper/metric/cpu_load.rb

@@ -1,7 +1,7 @@
 module LitmusPaper
   module Metric
     class CPULoad
-      def initialize(weight, facter = DeferredFacter)
+      def initialize(weight, facter = Facter)
         @weight = weight
         @facter = facter
       end

data/lib/litmus_paper/version.rb

@@ -1,3 +1,3 @@
 module LitmusPaper
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/lib/litmus_paper.rb

@@ -4,23 +4,14 @@ require 'net/https'
 require 'uri'
 require 'forwardable'
 
-require 'async-rack'
 require 'sinatra/base'
-require 'sinatra/synchrony'
-require 'em-synchrony/em-http'
-require 'em/syslog'
-
-require 'thin'
-require 'thin/callbacks'
-require 'thin/backends/tcp_server_with_callbacks'
-require 'thin/callback_rack_handler'
-
 require 'facter'
+require 'syslog_logger'
+
 require 'facts/loadaverage'
 
 require 'litmus_paper/app'
 require 'litmus_paper/configuration'
-require 'litmus_paper/deferred_facter'
 require 'litmus_paper/dependency/haproxy_backends'
 require 'litmus_paper/dependency/http'
 require 'litmus_paper/dependency/tcp'
@@ -35,17 +26,17 @@ require 'litmus_paper/status_file'
 module LitmusPaper
   class << self
     attr_reader :services, :config_dir
-    attr_accessor :logger, :config_file
+    attr_accessor :logger
   end
 
   self.logger = Logger.new
 
-  def self.configure!
-    LitmusPaper.logger.setup!
+  def self.configure(filename)
+    @config_file = filename
+
     begin
-      @services = LitmusPaper::Configuration.new(@config_file).evaluate
-    rescue Exception => e
-      logger.info("Error in configuration #{e.message}")
+      @services = LitmusPaper::Configuration.new(filename).evaluate
+    rescue Exception
     end
   end
 
@@ -54,11 +45,7 @@ module LitmusPaper
   end
 
   def self.reload
-    begin
-      @services = LitmusPaper::Configuration.new(@config_file).evaluate
-    rescue Exception => e
-      logger.info("Error in configuration #{e.message}")
-    end
+    configure(@config_file)
   end
 
   def self.reset
@@ -67,4 +54,3 @@ module LitmusPaper
 end
 
 Signal.trap("HUP") { LitmusPaper.reload }
-

data/litmus_paper.gemspec

@@ -15,21 +15,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = LitmusPaper::VERSION
 
-  gem.required_ruby_version = '>= 1.9.1'
-
-  gem.add_dependency "thin", "~> 1.3.1"
-  gem.add_dependency "async-rack", "~> 0.5.1"
   gem.add_dependency "sinatra", "~> 1.3.2"
-  gem.add_dependency "rack-fiber_pool", "~> 0.9"
   gem.add_dependency "facter", "~> 1.6.7"
-  gem.add_dependency "eventmachine",      "> 1.0.0.beta.1", "< 1.0.0.beta.100"
-  gem.add_dependency "em-http-request",   "~> 1.0"
-  gem.add_dependency "em-synchrony",      "~> 1.0"
-  gem.add_dependency "em-resolv-replace", "~> 1.1"
-  gem.add_dependency "em-syslog",         "~> 0.0.2"
+  gem.add_dependency "SyslogLogger", "1.4.1"
 
-  gem.add_development_dependency "rspec", "~> 2.9.0"
-  gem.add_development_dependency "rack-test", "~> 0.6.1"
-  gem.add_development_dependency "rake", "~> 0.9.2.2"
-  gem.add_development_dependency "rake_commit", "~> 0.13"
+  gem.add_development_dependency "rspec", "2.9.0"
+  gem.add_development_dependency "rack-test", "0.6.1"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rake_commit", "0.13"
 end

data/spec/litmus_paper/app_spec.rb

@@ -237,7 +237,7 @@ describe LitmusPaper::App do
         get "/test/error"
         last_response.status.should == 500
         last_response.headers["Content-Type"].should == "text/plain"
-        last_response.body.should == "Server Error: an error"
+        last_response.body.should == "Server Error"
       ensure
         app.environment = old_environment
       end

data/spec/litmus_paper/cli/admin_spec.rb

@@ -7,8 +7,7 @@ describe 'litmusctl' do
   end
 
   before(:all) do
-    `env RACK_ENV=production bundle exec ruby -I lib bin/litmus -p 9293 -d -D #{LitmusPaper.config_dir} -c #{TEST_CONFIG} -P /tmp/litmus.pid`
-    SpecHelper.wait_for_service :host => '127.0.0.1', :port => 9293
+    system "bundle exec ruby -I lib bin/litmus -p 9293 -d -D /tmp/litmus_paper -c #{TEST_CONFIG} -P /tmp/litmus.pid"
   end
 
   after(:all) do

data/spec/litmus_paper/dependency/haproxy_backends_spec.rb

@@ -1,45 +1,20 @@
 require 'spec_helper'
 
 describe LitmusPaper::Dependency::HaproxyBackends do
-  run_in_reactor
-
-  module StubHaproxy
-    def receive_data(data)
-      send_data(<<-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,
-yellow,FRONTEND,,,0,0,2000,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,3,0,,,,0,0,0,0,,,,,,,,,,,0,0,0,,,
-yellow_cluster,node1,0,0,0,0,,0,0,0,,0,,0,0,0,0,UP,1,1,0,0,1,35,35,,1,4,1,,0,,2,0,,0,L4CON,,0,,,,,,,0,,,,0,0,
-yellow_cluster,node2,0,0,0,0,,0,0,0,,0,,0,0,0,0,DOWN,1,1,0,0,1,35,35,,1,4,1,,0,,2,0,,0,L4CON,,0,,,,,,,0,,,,0,0,
-yellow_cluster,node3,0,0,0,0,,0,0,0,,0,,0,0,0,0,DOWN,1,1,0,0,1,34,34,,1,4,2,,0,,2,0,,0,L4CON,,0,,,,,,,0,,,,0,0,
-yellow_cluster,BACKEND,0,0,0,0,0,0,0,0,0,0,,0,0,0,0,UP,0,0,0,,1,34,34,,1,4,0,,0,,1,0,,0,,,,,,,,,,,,,,0,0,
-orange,FRONTEND,,,0,0,2000,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,5,0,,,,0,0,0,0,,,,,,,,,,,0,0,0,,,
-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,,2,0,,0,L4OK,,5,,,,,,,0,,,,0,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
-    end
-  end
-
   describe "available?" do
-    around(:each) do |spec|
-      begin
-        EM.start_unix_domain_server("/tmp/haproxy.#{Process.pid}", StubHaproxy)
-        spec.run
-      ensure
-        FileUtils.rm("/tmp/haproxy.#{Process.pid}")
-      end
+    before(:each) do
+      FileUtils.rm_rf("/tmp/stub-haproxy-stats")
+      system "spec/support/haproxy_test_socket /tmp/stub-haproxy-stats &"
+      sleep 1
     end
 
     it "is available if at least one backend is up" do
-      haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/tmp/haproxy.#{Process.pid}", "yellow_cluster")
+      haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/tmp/stub-haproxy-stats", "yellow_cluster")
       haproxy.should be_available
     end
 
     it "returns 0 if no nodes are available" do
-      haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/tmp/haproxy.#{Process.pid}", "orange_cluster")
+      haproxy = LitmusPaper::Dependency::HaproxyBackends.new("/tmp/stub-haproxy-stats", "orange_cluster")
       haproxy.should_not be_available
     end
   end

data/spec/litmus_paper/dependency/http_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe LitmusPaper::Dependency::HTTP do
-  run_in_reactor
-
   before(:all) do
     server_start = system "bundle exec rackup spec/support/http_test_server_config.ru --port 9294 --pid /tmp/http-test-server.pid --daemonize"
     SpecHelper.wait_for_service :host => '127.0.0.1', :port => 9294

data/spec/litmus_paper/dependency/tcp_spec.rb

@@ -1,37 +1,27 @@
 require 'spec_helper'
 
 describe LitmusPaper::Dependency::TCP do
-  run_in_reactor
+  before(:all) do
+    @server = TCPServer.new 3333
+  end
 
-  describe "#available?" do
-    around(:each) do |spec|
-      begin
-        @server = EM.start_server('127.0.0.1', 3333)
-        spec.run
-      ensure
-        EM.stop_server @server if @server
-      end
-    end
+  after(:all) do
+    @server.close
+  end
 
+  describe "#available?" do
     it "is true when it's able to reach the ip and port" do
       check = LitmusPaper::Dependency::TCP.new("127.0.0.1", 3333)
       check.should be_available
     end
 
-    it "cancels the timer when successful" do
-      SpecHelper.ensure_no_outstanding_timers do
-        check = LitmusPaper::Dependency::TCP.new("127.0.0.1", 3333)
-        check.should be_available
-      end
-    end
-
     it "is false when the ip is not available" do
-      check = LitmusPaper::Dependency::TCP.new("127.1.1.15", 3333, :timeout => 0.3)
+      check = LitmusPaper::Dependency::TCP.new("10.254.254.254", 3333)
       check.should_not be_available
     end
 
     it "is false when the port is not available" do
-      check = LitmusPaper::Dependency::TCP.new("127.0.0.1", 3334, :timeout => 0.3)
+      check = LitmusPaper::Dependency::TCP.new("127.0.0.1", 3334)
       check.should_not be_available
     end
   end

data/spec/litmus_paper/metric/available_memory_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe LitmusPaper::Metric::AvailableMemory do
-  run_in_reactor
-
   describe "#current_health" do
     it "multiplies weight by memory available" do
       facter = StubFacter.new({"memorytotal" => "10 GB", "memoryfree" => "5 GB"})
@@ -10,24 +8,12 @@ describe LitmusPaper::Metric::AvailableMemory do
       memory.current_health.should == 25
     end
 
-    it "multiplies weight by memory available when handling floating point values" do
-      facter = StubFacter.new({"memorytotal" => "2.0 GB", "memoryfree" => "1.8 GB"})
-      memory = LitmusPaper::Metric::AvailableMemory.new(50, facter)
-      memory.current_health.should == 44
-    end
-
     describe "#memory_total" do
       it "is a positive integer" do
         metric = LitmusPaper::Metric::AvailableMemory.new(50)
         metric.memory_total.should > 1_000
       end
 
-      it "handles floating point values properly" do
-        facter = StubFacter.new("memorytotal" => "1.80 GB")
-        memory = LitmusPaper::Metric::AvailableMemory.new(50, facter)
-        memory.memory_total.should == 1932735283
-      end
-
       it "is cached" do
         Facter.should_receive(:value).once.and_return("10 MB")
         metric = LitmusPaper::Metric::AvailableMemory.new(50)
@@ -42,12 +28,6 @@ describe LitmusPaper::Metric::AvailableMemory do
         metric = LitmusPaper::Metric::AvailableMemory.new(50)
         metric.memory_free.should > 100
       end
-
-      it "handles floating point values properly" do
-        facter = StubFacter.new("memoryfree" => "1.80 GB")
-        memory = LitmusPaper::Metric::AvailableMemory.new(50, facter)
-        memory.memory_free.should == 1932735283
-      end
     end
 
     describe "#to_s" do

data/spec/litmus_paper/metric/cpu_load_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe LitmusPaper::Metric::CPULoad do
-  run_in_reactor
-
   describe "#current_health" do
     it "is the percent of available cpu capacity" do
       facter = StubFacter.new({"processorcount" => "4", "loadaverage" => "1.00 0.40 0.10"})

data/spec/litmus_paper_spec.rb

@@ -3,16 +3,14 @@ require 'spec_helper'
 describe LitmusPaper do
   describe 'configure' do
     it 'populates services from the config file' do
-      LitmusPaper.config_file = TEST_CONFIG
-      LitmusPaper.configure!
+      LitmusPaper.configure(TEST_CONFIG)
       LitmusPaper.services.has_key?('test').should == true
     end
   end
 
   describe "reload" do
     it "will reconfigure the services" do
-      LitmusPaper.config_file = TEST_CONFIG
-      LitmusPaper.configure!
+      LitmusPaper.configure(TEST_CONFIG)
       LitmusPaper.services["bar"] = :service
 
       LitmusPaper.reload
@@ -22,18 +20,20 @@ describe LitmusPaper do
     end
 
     it "keeps the old config if there are errors in the new config" do
-      LitmusPaper.config_file = SpecHelper.create_temp_file(<<-END)
+      old_config_file = SpecHelper.create_temp_file(<<-END)
         service :old_service do |s|
           s.measure_health Metric::CPULoad, :weight => 100
         end
       END
-      LitmusPaper.configure!
-      LitmusPaper.config_file = SpecHelper.create_temp_file(<<-END)
+      new_bad_config_file = SpecHelper.create_temp_file(<<-END)
         service :old_service do |s|
           syntax error here
         end
       END
-      LitmusPaper.reload
+      LitmusPaper.configure(old_config_file)
+      LitmusPaper.services.keys.should == ["old_service"]
+      LitmusPaper.configure(new_bad_config_file)
+      LitmusPaper.services.keys.should == ["old_service"]
     end
   end
 end

data/spec/spec_helper.rb

@@ -14,18 +14,6 @@ RSpec.configure do |config|
   config.before :each do
     FileUtils.rm_rf(LitmusPaper.config_dir)
     LitmusPaper.reset
-    LitmusPaper.logger = NullLogger.new
-  end
-end
-
-def run_in_reactor(timeout = 5)
-  around(:each) do |spec|
-    EM.synchrony do
-      sig = EM.add_timer(timeout) { fail "timeout!"; EM.stop }
-      spec.run
-      EM.cancel_timer(sig)
-      EM.stop
-    end
   end
 end
 
@@ -37,15 +25,6 @@ module SpecHelper
     file.path
   end
 
-  def self.ensure_no_outstanding_timers(&block)
-    timer_keys = EM.instance_variable_get("@timers").keys
-    yield
-    new_timer_keys = EM.instance_variable_get("@timers").keys - timer_keys
-    new_timer_keys.each do |timer_key|
-      EM.instance_variable_get("@timers")[timer_key].should == false
-    end
-  end
-
   def self.wait_for_service(options)
     Timeout::timeout(options[:timeout] || 20) do
       loop do

data/spec/support/haproxy_test_socket

@@ -0,0 +1,22 @@
+#! /usr/bin/env ruby
+
+require 'socket'
+
+UNIXServer.open(ARGV[0]) do |server|
+  socket = server.accept
+  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,
+yellow,FRONTEND,,,0,0,2000,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,3,0,,,,0,0,0,0,,,,,,,,,,,0,0,0,,,
+yellow_cluster,node1,0,0,0,0,,0,0,0,,0,,0,0,0,0,UP,1,1,0,0,1,35,35,,1,4,1,,0,,2,0,,0,L4CON,,0,,,,,,,0,,,,0,0,
+yellow_cluster,node2,0,0,0,0,,0,0,0,,0,,0,0,0,0,DOWN,1,1,0,0,1,35,35,,1,4,1,,0,,2,0,,0,L4CON,,0,,,,,,,0,,,,0,0,
+yellow_cluster,node3,0,0,0,0,,0,0,0,,0,,0,0,0,0,DOWN,1,1,0,0,1,34,34,,1,4,2,,0,,2,0,,0,L4CON,,0,,,,,,,0,,,,0,0,
+yellow_cluster,BACKEND,0,0,0,0,0,0,0,0,0,0,,0,0,0,0,UP,0,0,0,,1,34,34,,1,4,0,,0,,1,0,,0,,,,,,,,,,,,,,0,0,
+orange,FRONTEND,,,0,0,2000,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,5,0,,,,0,0,0,0,,,,,,,,,,,0,0,0,,,
+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,,2,0,,0,L4OK,,5,,,,,,,0,,,,0,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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: litmus_paper
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &70141208657940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141208657940
-- !ruby/object:Gem::Dependency
-  name: async-rack
-  requirement: &70141208657480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141208657480
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70141208657020 !ruby/object:Gem::Requirement
+  requirement: &70190125701040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +21,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70141208657020
-- !ruby/object:Gem::Dependency
-  name: rack-fiber_pool
-  requirement: &70141208656540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141208656540
+  version_requirements: *70190125701040
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &70141208656060 !ruby/object:Gem::Requirement
+  requirement: &70190125700200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,109 +32,62 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70141208656060
+  version_requirements: *70190125700200
 - !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &70141208655560 !ruby/object:Gem::Requirement
+  name: SyslogLogger
+  requirement: &70190125698680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.1
-    - - <
-      - !ruby/object:Gem::Version
-        version: 1.0.0.beta.100
+        version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70141208655560
-- !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: &70141208654800 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141208654800
-- !ruby/object:Gem::Dependency
-  name: em-synchrony
-  requirement: &70141208654320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141208654320
-- !ruby/object:Gem::Dependency
-  name: em-resolv-replace
-  requirement: &70141208653820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141208653820
-- !ruby/object:Gem::Dependency
-  name: em-syslog
-  requirement: &70141208653340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70141208653340
+  version_requirements: *70190125698680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70141208652840 !ruby/object:Gem::Requirement
+  requirement: &70190125696660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70141208652840
+  version_requirements: *70190125696660
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70141208652340 !ruby/object:Gem::Requirement
+  requirement: &70190125694260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70141208652340
+  version_requirements: *70190125694260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70141208651880 !ruby/object:Gem::Requirement
+  requirement: &70190125693180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70141208651880
+  version_requirements: *70190125693180
 - !ruby/object:Gem::Dependency
   name: rake_commit
-  requirement: &70141208651420 !ruby/object:Gem::Requirement
+  requirement: &70190125691740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :development
   prerelease: false
-  version_requirements: *70141208651420
+  version_requirements: *70190125691740
 description: Backend health tester for HA Services
 email:
 - code@getbraintree.com
@@ -194,7 +114,6 @@ files:
 - lib/litmus_paper/cli/admin.rb
 - lib/litmus_paper/cli/server.rb
 - lib/litmus_paper/configuration.rb
-- lib/litmus_paper/deferred_facter.rb
 - lib/litmus_paper/dependency/haproxy_backends.rb
 - lib/litmus_paper/dependency/http.rb
 - lib/litmus_paper/dependency/tcp.rb
@@ -206,16 +125,11 @@ files:
 - lib/litmus_paper/service.rb
 - lib/litmus_paper/status_file.rb
 - lib/litmus_paper/version.rb
-- lib/sinatra/synchrony.rb
-- lib/thin/backends/tcp_server_with_callbacks.rb
-- lib/thin/callback_rack_handler.rb
-- lib/thin/callbacks.rb
 - litmus_paper.gemspec
 - spec/litmus_paper/app_spec.rb
 - spec/litmus_paper/cli/admin_spec.rb
 - spec/litmus_paper/cli/server_spec.rb
 - spec/litmus_paper/configuration_spec.rb
-- spec/litmus_paper/deferred_facter_spec.rb
 - spec/litmus_paper/dependency/haproxy_backends_spec.rb
 - spec/litmus_paper/dependency/http_spec.rb
 - spec/litmus_paper/dependency/tcp_spec.rb
@@ -233,10 +147,10 @@ files:
 - spec/support/config.d/passing_test.config
 - spec/support/config.d/test.config
 - spec/support/constant_metric.rb
+- spec/support/haproxy_test_socket
 - spec/support/http_test_server.rb
 - spec/support/http_test_server_config.ru
 - spec/support/never_available_dependency.rb
-- spec/support/null_logger.rb
 - spec/support/stdout_logger.rb
 - spec/support/stub_facter.rb
 - spec/support/test.config
@@ -252,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +184,6 @@ test_files:
 - spec/litmus_paper/cli/admin_spec.rb
 - spec/litmus_paper/cli/server_spec.rb
 - spec/litmus_paper/configuration_spec.rb
-- spec/litmus_paper/deferred_facter_spec.rb
 - spec/litmus_paper/dependency/haproxy_backends_spec.rb
 - spec/litmus_paper/dependency/http_spec.rb
 - spec/litmus_paper/dependency/tcp_spec.rb
@@ -288,10 +201,10 @@ test_files:
 - spec/support/config.d/passing_test.config
 - spec/support/config.d/test.config
 - spec/support/constant_metric.rb
+- spec/support/haproxy_test_socket
 - spec/support/http_test_server.rb
 - spec/support/http_test_server_config.ru
 - spec/support/never_available_dependency.rb
-- spec/support/null_logger.rb
 - spec/support/stdout_logger.rb
 - spec/support/stub_facter.rb
 - spec/support/test.config

data/lib/litmus_paper/deferred_facter.rb

@@ -1,14 +0,0 @@
-module LitmusPaper
-  class DeferredFacter
-    def self.value(key)
-      fiber = Fiber.current
-
-      EM.defer(
-        proc { Facter.value(key) },
-        proc { |value| fiber.resume(value) }
-      )
-
-      return Fiber.yield
-    end
-  end
-end

data/lib/sinatra/synchrony.rb

@@ -1,41 +0,0 @@
-# inlined from sinatra-synchrony
-require 'sinatra/base'
-require 'rack/fiber_pool'
-require 'eventmachine'
-require 'em-http-request'
-require 'em-synchrony'
-require 'em-resolv-replace'
-
-module Sinatra
-  module Synchrony
-    def self.registered(app)
-      app.disable :threaded
-    end
-
-    def setup_sessions(builder)
-      builder.use Rack::FiberPool, {:rescue_exception => handle_exception } unless test?
-      super
-    end
-
-    def handle_exception
-      Proc.new do |env, e|
-        if settings.show_exceptions?
-          request = Sinatra::Request.new(env)
-          printer = Sinatra::ShowExceptions.new(proc{ raise e })
-          s, h, b = printer.call(env)
-          [s, h, b]
-        else
-          LitmusPaper.logger.info(e)
-          [500, {}, ""]
-        end
-      end
-    end
-
-    class << self
-      def overload_tcpsocket!
-        require 'sinatra/synchrony/tcpsocket'
-      end
-    end
-  end
-  register Synchrony
-end

data/lib/thin/backends/tcp_server_with_callbacks.rb

@@ -1,20 +0,0 @@
-module Thin
-  module Backends
-    class TcpServerWithCallbacks < TcpServer
-      def initialize(host, port, options)
-        super(host, port)
-      end
-
-      def connect
-        super
-        Thin::Callbacks.after_connect_callbacks.each { |callback| callback.call }
-      end
-
-      def disconnect
-        Thin::Callbacks.before_disconnect_callbacks.each { |callback| callback.call }
-        super
-      end
-    end
-  end
-end
-

data/lib/thin/callback_rack_handler.rb

@@ -1,14 +0,0 @@
-module Thin
-  class CallbackRackHandler
-    def self.run(app, options)
-      server = ::Thin::Server.new(options[:Host] || '0.0.0.0',
-                                  options[:Port] || 8080,
-                                  app,
-                                  options)
-      yield server if block_given?
-      server.start
-    end
-  end
-end
-
-Rack::Handler.register 'thin-with-callbacks', Thin::CallbackRackHandler

data/lib/thin/callbacks.rb

@@ -1,19 +0,0 @@
-module Thin
-  class Callbacks
-    def self.after_connect_callbacks
-      @after_connect_callbacks ||= []
-    end
-
-    def self.after_connect(&block)
-      after_connect_callbacks << block
-    end
-
-    def self.before_disconnect_callbacks
-      @before_disconnect_callbacks ||= []
-    end
-
-    def self.before_disconnect(&block)
-      before_disconnect_callbacks << block
-    end
-  end
-end

data/spec/litmus_paper/deferred_facter_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe LitmusPaper::DeferredFacter do
-  run_in_reactor
-
-  describe "value" do
-    it "executes Facter access on another thread" do
-      processors = LitmusPaper::DeferredFacter.value("processorcount")
-      processors.should match(/\d+/)
-    end
-  end
-end

data/spec/support/null_logger.rb

@@ -1,11 +0,0 @@
-class NullLogger
-  def write(message)
-  end
-  def info(message)
-  end
-  def debug(message)
-  end
-
-  def setup!
-  end
-end