litmus_paper 0.6.2 → 0.6.3

data/lib/litmus_paper.rb

@@ -22,6 +22,7 @@ require 'facts/loadaverage'
 
 require 'litmus_paper/app'
 require 'litmus_paper/configuration'
+require 'litmus_paper/configuration_file'
 require 'litmus_paper/dependency/haproxy_backends'
 require 'litmus_paper/dependency/http'
 require 'litmus_paper/dependency/tcp'
@@ -37,7 +38,8 @@ require 'litmus_paper/version'
 
 module LitmusPaper
   class << self
-    attr_reader :services, :config_dir
+    extend Forwardable
+    def_delegators :@config, :services, :data_directory, :port
     attr_accessor :logger
   end
 
@@ -46,7 +48,7 @@ module LitmusPaper
   def self.check_service(service_name)
     Facter.flush
 
-    if service = @services[service_name]
+    if service = services[service_name]
       service.current_health
     else
       nil
@@ -55,24 +57,17 @@ module LitmusPaper
 
   def self.configure(filename)
     @config_file = filename
-
-    begin
-      @services = LitmusPaper::Configuration.new(filename).evaluate
-    rescue Exception
-    end
-  end
-
-  def self.config_dir=(path)
-    @config_dir = Pathname.new(path)
+    @config = LitmusPaper::ConfigurationFile.new(filename).evaluate
   end
 
   def self.reload
     LitmusPaper.logger.info "Reloading configuration"
-    configure(@config_file)
-  end
-
-  def self.reset
-    @services = {}
+    begin
+      configure(@config_file)
+    rescue Exception => e
+      LitmusPaper.logger.error "Problem reloading config: #{e.message}"
+      LitmusPaper.logger.error e.backtrace.join("\n")
+    end
   end
 end
 

data/lib/litmus_paper/cli/admin.rb

@@ -15,7 +15,8 @@ module LitmusPaper
         if command = Admin.commands[command_name]
           options = {}
           request = command.build_request(options, argv)
-          _litmus_request(options[:host], options[:port], request)
+          LitmusPaper.configure(options[:litmus_config])
+          _litmus_request('127.0.0.1', LitmusPaper.port, request)
         else
           _display_help
         end

data/lib/litmus_paper/cli/admin/command.rb

@@ -3,18 +3,15 @@ module LitmusPaper
     class Admin
       class Command
         def self._default_options
-          options = { :port => 9292, :host => '127.0.0.1' }
+          options = { :litmus_config => "/etc/litmus.conf" }
         end
 
         def self._extend_default_parser(options, &block)
           OptionParser.new do |opts|
             block.call(opts)
 
-            opts.on("-p", "--port=port", Integer, "Port litmus is running on", "Default: 9292") do |port|
-              options[:port] = port
-            end
-            opts.on("-h", "--host=ip", String, ":Host litmus is running on", "Default: localhost") do |host|
-              options[:host] = host
+            opts.on("-c", "--config=file", String, "Litmus configuration file", "Default: /etc/litmus.conf") do |config|
+              options[:litmus_config] = config
             end
             opts.on("--help", "Show this help message.") { puts opts; exit }
           end

data/lib/litmus_paper/cli/server.rb

@@ -9,13 +9,8 @@ module LitmusPaper
             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,
-                    "Litmus data directory", "Default: /etc/litmus") { |v| options[:config_dir] = v }
-
             opts.separator ""
 
-            opts.on("-p", "--port=port", Integer,
-                    "Runs Litmus on the specified port.", "Default: 9292") { |v| options[:Port] = v }
             opts.on("-b", "--binding=ip", String,
                     "Binds Litmus to the specified ip.", "Default: 0.0.0.0") { |v| options[:Host] = v }
             opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true }
@@ -47,14 +42,14 @@ module LitmusPaper
         end
 
         LitmusPaper.configure(options[:litmus_config])
-        LitmusPaper.config_dir = options[:config_dir]
+        options[:Port] = LitmusPaper.port
+
         super
       end
 
       def default_options
         super.merge(
-          :litmus_config => '/etc/litmus.conf',
-          :config_dir => '/etc/litmus'
+          :litmus_config => '/etc/litmus.conf'
         )
       end
     end

data/lib/litmus_paper/configuration.rb

@@ -1,30 +1,4 @@
 module LitmusPaper
-  class Configuration
-    def initialize(config_file_path)
-      @config_file_path = config_file_path
-      @services = {}
-    end
-
-    def evaluate(file = @config_file_path)
-      LitmusPaper.logger.info "Loading file #{file}"
-      config_contents = File.read(file)
-      instance_eval(config_contents)
-      @services
-    end
-
-    def include_files(glob_pattern)
-      full_glob_pattern = File.expand_path(glob_pattern, File.dirname(@config_file_path))
-      LitmusPaper.logger.info "Searching for files matching: #{full_glob_pattern}"
-
-      Dir.glob(full_glob_pattern).each do |file|
-        evaluate(file)
-      end
-    end
-
-    def service(name, &block)
-      service = Service.new(name.to_s)
-      block.call(service)
-      @services[name.to_s] = service
-    end
+  class Configuration < Struct.new(:port, :data_directory, :services)
   end
 end

data/lib/litmus_paper/configuration_file.rb

@@ -0,0 +1,40 @@
+module LitmusPaper
+  class ConfigurationFile
+    def initialize(config_file_path)
+      @config_file_path = config_file_path
+      @services = {}
+      @port = 9292
+      @data_directory = "/etc/litmus"
+    end
+
+    def evaluate(file = @config_file_path)
+      LitmusPaper.logger.info "Loading file #{file}"
+      config_contents = File.read(file)
+      instance_eval(config_contents)
+      LitmusPaper::Configuration.new(@port, @data_directory, @services)
+    end
+
+    def include_files(glob_pattern)
+      full_glob_pattern = File.expand_path(glob_pattern, File.dirname(@config_file_path))
+      LitmusPaper.logger.info "Searching for files matching: #{full_glob_pattern}"
+
+      Dir.glob(full_glob_pattern).each do |file|
+        evaluate(file)
+      end
+    end
+
+    def port(port)
+      @port = port
+    end
+
+    def data_directory(directory)
+      @data_directory = directory
+    end
+
+    def service(name, &block)
+      service = Service.new(name.to_s)
+      block.call(service)
+      @services[name.to_s] = service
+    end
+  end
+end

data/lib/litmus_paper/dependency/haproxy_backends.rb

@@ -11,12 +11,15 @@ module LitmusPaper
 
       def available?
         stats = _parse_stats(_fetch_stats)
+        backend = _find_backend(stats, @cluster)
 
-        servers = _servers_in(stats, @cluster)
-        available = servers.select { |s| s['status'] == "UP" }
-
-        available.size > 0
+        if backend['status'] != 'UP'
+          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}")
         false
       end
 
@@ -24,9 +27,9 @@ module LitmusPaper
         "Dependency::HaproxyBackends(#{@domain_socket}, #{@cluster})"
       end
 
-      def _servers_in(stats, cluster)
-        stats.select do |line|
-          line['# pxname'] == cluster && !["FRONTEND", "BACKEND"].include?(line["svname"])
+      def _find_backend(stats, cluster)
+        stats.detect do |line|
+          line['# pxname'] == cluster && line['svname'] == 'BACKEND'
         end
       end
 

data/lib/litmus_paper/dependency/tcp.rb

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

data/lib/litmus_paper/logger.rb

@@ -1,7 +1,7 @@
 module LitmusPaper
   class Logger
     extend Forwardable
-    def_delegators :@syslog, :debug, :info
+    def_delegators :@syslog, :debug, :info, :error
 
     def initialize
       @syslog = SyslogLogger.new("litmus_paper")

data/lib/litmus_paper/status_file.rb

@@ -28,7 +28,7 @@ module LitmusPaper
     end
 
     def initialize(filename, health)
-      @path = File.join(LitmusPaper.config_dir, filename)
+      @path = File.join(LitmusPaper.data_directory, filename)
       @health = health
     end
 

data/lib/litmus_paper/version.rb

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

data/spec/litmus_paper/app_spec.rb

@@ -5,6 +5,10 @@ describe LitmusPaper::App do
     LitmusPaper::App
   end
 
+  before :each do
+    LitmusPaper.configure(TEST_CONFIG)
+  end
+
   describe "GET /" do
     it "returns the list of services litmus monitors" do
       LitmusPaper.services['test'] = LitmusPaper::Service.new('test')

data/spec/litmus_paper/cli/admin_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 
 describe 'litmusctl' do
   def _litmusctl(args)
-    `bundle exec ruby -I lib bin/litmusctl #{args} -p 9293`
+    `bundle exec ruby -I lib bin/litmusctl #{args} -c #{TEST_CONFIG}`
   end
 
   before(:all) do
-    system "bundle exec ruby -I lib bin/litmus -p 9293 -d -D /tmp/litmus_paper -c #{TEST_CONFIG} -P /tmp/litmus.pid"
+    system "bundle exec ruby -I lib bin/litmus -d -c #{TEST_CONFIG} -P /tmp/litmus.pid"
   end
 
   after(:all) do

data/spec/litmus_paper/cli/server_spec.rb

@@ -7,10 +7,5 @@ describe LitmusPaper::CLI::Server do
       options = LitmusPaper::CLI::Server::Options.new.parse!(['-c', 'foo.conf'])
       options[:litmus_config].should == 'foo.conf'
     end
-
-    it 'parses the config dir options' do
-      options = LitmusPaper::CLI::Server::Options.new.parse!(['-D', '/tmp/foo'])
-      options[:config_dir].should == '/tmp/foo'
-    end
   end
 end

data/spec/litmus_paper/configuration_file_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe LitmusPaper::ConfigurationFile do
+  describe "evaluate" do
+    it "configures a service" do
+      config_file = LitmusPaper::ConfigurationFile.new(TEST_CONFIG)
+      config = config_file.evaluate
+      config.services.has_key?('test').should == true
+    end
+
+    it "configures the port to listen on" do
+      config_file = LitmusPaper::ConfigurationFile.new(TEST_CONFIG)
+      config = config_file.evaluate
+      config.port.should == 9293
+    end
+
+    it "configures the data directory" do
+      config_file = LitmusPaper::ConfigurationFile.new(TEST_CONFIG)
+      config = config_file.evaluate
+      config.data_directory.should == "/tmp/litmus_paper"
+    end
+  end
+
+  describe "include_files" do
+    it "configures a dir glob of services" do
+      config_file = LitmusPaper::ConfigurationFile.new(TEST_D_CONFIG)
+      config = config_file.evaluate
+      config.services.has_key?('test').should == true
+    end
+
+    it "defaults configuration options" do
+      config_file = LitmusPaper::ConfigurationFile.new(TEST_D_CONFIG)
+      config = config_file.evaluate
+      config.services.has_key?('test').should == true
+      config.port.should == 9292
+      config.data_directory.should == "/etc/litmus"
+    end
+  end
+end

data/spec/litmus_paper_spec.rb

@@ -32,20 +32,36 @@ describe LitmusPaper do
       LitmusPaper.services.has_key?('test').should == true
     end
 
-    it "keeps the old config if there are errors in the new config" do
-      old_config_file = SpecHelper.create_temp_file(<<-END)
+    it "blows up when initial configuration is invalid" do
+      bad_config_file = SpecHelper.create_temp_file(<<-END)
         service :old_service do |s|
-          s.measure_health Metric::CPULoad, :weight => 100
+          syntax error here
         end
       END
-      new_bad_config_file = SpecHelper.create_temp_file(<<-END)
+      expect do
+        LitmusPaper.configure(bad_config_file)
+      end.should raise_error
+    end
+
+    it "keeps the old config if there are errors in the new config" do
+      config_file = SpecHelper.create_temp_file(<<-END)
         service :old_service do |s|
-          syntax error here
+          s.measure_health Metric::CPULoad, :weight => 100
         end
       END
-      LitmusPaper.configure(old_config_file)
+
+      LitmusPaper.configure(config_file)
       LitmusPaper.services.keys.should == ["old_service"]
-      LitmusPaper.configure(new_bad_config_file)
+
+      File.open(config_file, "w") do |file|
+        file.write(<<-END)
+          service :old_service do |s|
+            syntax error here
+          end
+        END
+      end
+
+      LitmusPaper.reload
       LitmusPaper.services.keys.should == ["old_service"]
     end
   end

data/spec/spec_helper.rb

@@ -5,6 +5,11 @@ require 'rack/test'
 require 'litmus_paper'
 require 'tempfile'
 
+TEST_CONFIG_DIR = "/tmp/litmus_paper"
+TEST_CONFIG = File.expand_path('support/test.config', File.dirname(__FILE__))
+TEST_D_CONFIG = File.expand_path('support/test.d.config', File.dirname(__FILE__))
+TEST_CA_CERT = File.expand_path('ssl/server.crt', File.dirname(__FILE__))
+
 Dir.glob("#{File.expand_path('support', File.dirname(__FILE__))}/**/*.rb").each { |f| require f }
 
 RSpec.configure do |config|
@@ -12,8 +17,8 @@ RSpec.configure do |config|
   config.include Rack::Test::Methods
 
   config.before :each do
-    FileUtils.rm_rf(LitmusPaper.config_dir)
-    LitmusPaper.reset
+    FileUtils.rm_rf TEST_CONFIG_DIR
+    LitmusPaper.stub(:data_directory).and_return(TEST_CONFIG_DIR)
   end
 end
 
@@ -39,9 +44,3 @@ module SpecHelper
     end
   end
 end
-
-LitmusPaper.config_dir = "/tmp/litmus_paper"
-
-TEST_CONFIG = File.expand_path('support/test.config', File.dirname(__FILE__))
-TEST_D_CONFIG = File.expand_path('support/test.d.config', File.dirname(__FILE__))
-TEST_CA_CERT = File.expand_path('ssl/server.crt', File.dirname(__FILE__))

data/spec/support/test.config

@@ -1,5 +1,9 @@
 # vim: set ft=ruby
 
+port 9293
+
+data_directory "/tmp/litmus_paper"
+
 service :test do |s|
   s.depends Dependency::HTTP, "http://localhost/heartbeat"
 

metadata

@@ -1,137 +1,146 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: litmus_paper
-version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 1
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 3
+  version: 0.6.3
 platform: ruby
-authors:
+authors: 
 - Braintreeps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-07 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-- !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: *id001
+- !ruby/object:Gem::Dependency 
+  name: facter
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-- !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: *id002
+- !ruby/object:Gem::Dependency 
+  name: SyslogLogger
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-- !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: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-- !ruby/object:Gem::Dependency
-  name: rake_commit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.13'
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake_commit
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
+  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
@@ -153,6 +162,7 @@ files:
 - lib/litmus_paper/cli/admin/status.rb
 - lib/litmus_paper/cli/server.rb
 - lib/litmus_paper/configuration.rb
+- lib/litmus_paper/configuration_file.rb
 - lib/litmus_paper/dependency/haproxy_backends.rb
 - lib/litmus_paper/dependency/http.rb
 - lib/litmus_paper/dependency/tcp.rb
@@ -169,7 +179,7 @@ files:
 - 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/configuration_file_spec.rb
 - spec/litmus_paper/dependency/haproxy_backends_spec.rb
 - spec/litmus_paper/dependency/http_spec.rb
 - spec/litmus_paper/dependency/tcp_spec.rb
@@ -196,35 +206,45 @@ 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.23
+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
-- spec/litmus_paper/configuration_spec.rb
+- spec/litmus_paper/configuration_file_spec.rb
 - spec/litmus_paper/dependency/haproxy_backends_spec.rb
 - spec/litmus_paper/dependency/http_spec.rb
 - spec/litmus_paper/dependency/tcp_spec.rb

data/spec/litmus_paper/configuration_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe LitmusPaper::Configuration do
-  describe "evaluate" do
-    it "configures a service" do
-      config = LitmusPaper::Configuration.new(TEST_CONFIG)
-      services = config.evaluate
-      services.has_key?('test').should == true
-    end
-  end
-
-  describe "include_files" do
-    it "configures a dir glob of services" do
-      config = LitmusPaper::Configuration.new(TEST_D_CONFIG)
-      services = config.evaluate
-      services.has_key?('test').should == true
-    end
-  end
-end