sensu 0.9.6.beta.4 → 0.9.6.beta.5

data/lib/sensu/api.rb

@@ -1,10 +1,8 @@
 require File.join(File.dirname(__FILE__), 'base')
+require File.join(File.dirname(__FILE__), 'redis')
 
 require 'thin'
 require 'sinatra/async'
-require 'redis'
-
-require File.join(File.dirname(__FILE__), 'patches', 'redis')
 
 module Sensu
   class API < Sinatra::Base
@@ -26,13 +24,17 @@ module Sensu
     end
 
     def self.setup(options={})
+      $logger = Cabin::Channel.get
       base = Sensu::Base.new(options)
-      $logger = base.logger
       $settings = base.settings
       $logger.debug('connecting to redis', {
         :settings => $settings[:redis]
       })
-      $redis = Redis.connect($settings[:redis])
+      $redis = Sensu::Redis.connect($settings[:redis])
+      $redis.on_disconnect = Proc.new do
+        $logger.warn('reconnecting to redis')
+        $redis.reconnect!
+      end
       $logger.debug('connecting to rabbitmq', {
         :settings => $settings[:rabbitmq]
       })
@@ -45,7 +47,15 @@ module Sensu
       end
     end
 
-    def request_log(env)
+    def healthy?
+      unless $redis.connected?
+        unless env['REQUEST_PATH'] == '/info'
+          halt 500
+        end
+      end
+    end
+
+    def request_log
       $logger.info([env['REQUEST_METHOD'], env['REQUEST_PATH']].join(' '), {
         :remote_address => env['REMOTE_ADDR'],
         :user_agent => env['HTTP_USER_AGENT'],
@@ -71,7 +81,8 @@ module Sensu
 
     before do
       content_type 'application/json'
-      request_log(env)
+      request_log
+      healthy?
     end
 
     aget '/info' do
@@ -80,16 +91,10 @@ module Sensu
           :version => Sensu::VERSION
         },
         :health => {
-          :redis => 'ok',
-          :rabbitmq => 'ok'
+          :redis => $redis.connected? ? 'ok' : 'down',
+          :rabbitmq => $rabbitmq.connected? ? 'ok' : 'down'
         }
       }
-      if $redis.reconnecting?
-        response[:health][:redis] = 'down'
-      end
-      if $rabbitmq.reconnecting?
-        response[:health][:rabbitmq] = 'down'
-      end
       body response.to_json
     end
 
@@ -378,10 +383,9 @@ module Sensu
         :signal => signal
       })
       $logger.warn('stopping')
+      $redis.close
       $logger.warn('stopping reactor')
-      EM::PeriodicTimer.new(0.25) do
-        EM::stop_event_loop
-      end
+      EM::stop_event_loop
     end
   end
 end

data/lib/sensu/base.rb

@@ -10,7 +10,6 @@ require 'cabin'
 require 'amqp'
 
 require File.join(File.dirname(__FILE__), 'patches', 'ruby')
-require File.join(File.dirname(__FILE__), 'patches', 'amqp')
 
 require File.join(File.dirname(__FILE__), 'constants')
 require File.join(File.dirname(__FILE__), 'cli')
@@ -20,11 +19,10 @@ require File.join(File.dirname(__FILE__), 'process')
 
 module Sensu
   class Base
-    attr_reader :options, :logger, :settings
+    attr_reader :options, :settings
 
     def initialize(options={})
       @options = Sensu::DEFAULT_OPTIONS.merge(options)
-      @logger = Cabin::Channel.get
       setup_logging
       setup_settings
       setup_process
@@ -43,15 +41,7 @@ module Sensu
       Dir[@options[:config_dir] + '/**/*.json'].each do |file|
         @settings.load_file(file)
       end
-      begin
-        @settings.validate
-      rescue => error
-        @logger.fatal('config invalid', {
-          :error => error.to_s
-        })
-        @logger.fatal('SENSU NOT RUNNING!')
-        exit 2
-      end
+      @settings.validate
       @settings.set_env
     end
 

data/lib/sensu/client.rb

@@ -22,8 +22,8 @@ module Sensu
     end
 
     def initialize(options={})
+      @logger = Cabin::Channel.get
       base = Sensu::Base.new(options)
-      @logger = base.logger
       @settings = base.settings
       @timers = Array.new
       @checks_in_progress = Array.new
@@ -48,8 +48,8 @@ module Sensu
     def setup_keepalives
       @logger.debug('scheduling keepalives')
       publish_keepalive
-      @timers << EM::PeriodicTimer.new(30) do
-        unless @rabbitmq.reconnecting?
+      @timers << EM::PeriodicTimer.new(20) do
+        if @rabbitmq.connected?
           publish_keepalive
         end
       end
@@ -90,7 +90,8 @@ module Sensu
             substitute
           end
           if unmatched_tokens.empty?
-            execute = proc do
+            execute = Proc.new do
+              check = check.dup
               started = Time.now.to_f
               begin
                 IO.popen(command + ' 2>&1') do |io|
@@ -105,14 +106,11 @@ module Sensu
                 check[:status] = 2
               end
               check[:duration] = ('%.3f' % (Time.now.to_f - started)).to_f
+              check
             end
-            publish = proc do
+            publish = Proc.new do |check|
               unless check[:status].nil?
                 publish_result(check)
-              else
-                @logger.warn('nil exit status code', {
-                  :check => check
-                })
               end
               @checks_in_progress.delete(check[:name])
             end
@@ -178,28 +176,28 @@ module Sensu
     def setup_rabbitmq_monitor
       @logger.debug('monitoring rabbitmq connection')
       @timers << EM::PeriodicTimer.new(5) do
-        if @rabbitmq.reconnecting?
-          @logger.warn('reconnecting to rabbitmq')
-        else
+        if @rabbitmq.connected?
           unless @check_request_queue.subscribed?
             @logger.warn('re-subscribing to client subscriptions')
             setup_subscriptions
           end
+        else
+          @logger.warn('reconnecting to rabbitmq')
         end
       end
     end
 
-    def setup_standalone(options={})
+    def setup_standalone
       @logger.debug('scheduling standalone checks')
       standalone_check_count = 0
-      stagger = options[:test] ? 0 : 7
+      stagger = testing? ? 0 : 7
       @settings.checks.each do |check|
         if check[:standalone]
           standalone_check_count += 1
           @timers << EM::Timer.new(stagger * standalone_check_count) do
-            interval = options[:test] ? 0.5 : check[:interval]
+            interval = testing? ? 0.5 : check[:interval]
             @timers << EM::PeriodicTimer.new(interval) do
-              unless @rabbitmq.reconnecting?
+              if @rabbitmq.connected?
                 check[:issued] = Time.now.to_i
                 execute_check(check)
               end
@@ -226,19 +224,33 @@ module Sensu
       end
     end
 
-    def stop_reactor
+    def unsubscribe(&block)
+      if @rabbitmq.connected?
+        @logger.warn('unsubscribing from client subscriptions')
+        @check_request_queue.unsubscribe do
+          if block
+            block.call
+          end
+        end
+      else
+        if block
+          block.call
+        end
+      end
+    end
+
+    def complete_checks_in_progress(&block)
       @logger.info('completing checks in progress', {
         :checks_in_progress => @checks_in_progress
       })
-      complete_in_progress = EM::tick_loop do
+      complete = EM::tick_loop do
         if @checks_in_progress.empty?
           :stop
         end
       end
-      complete_in_progress.on_stop do
-        @logger.warn('stopping reactor')
-        EM::PeriodicTimer.new(0.25) do
-          EM::stop_event_loop
+      complete.on_stop do
+        if block
+          block.call
         end
       end
     end
@@ -251,14 +263,18 @@ module Sensu
       @timers.each do |timer|
         timer.cancel
       end
-      unless @rabbitmq.reconnecting?
-        @logger.warn('unsubscribing from client subscriptions')
-        @check_request_queue.unsubscribe do
-          stop_reactor
+      unsubscribe do
+        complete_checks_in_progress do
+          @logger.warn('stopping reactor')
+          EM::stop_event_loop
         end
-      else
-        EM::stop_event_loop
       end
     end
+
+    private
+
+    def testing?
+      File.basename($0) == 'rake'
+    end
   end
 end

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.6.beta.4'
+    VERSION = '0.9.6.beta.5'
   end
 
   unless defined?(Sensu::DEFAULT_OPTIONS)

data/lib/sensu/redis.rb

@@ -0,0 +1,81 @@
+require 'redis'
+
+module Sensu
+  class Redis < Redis::Client
+    attr_accessor :host, :port, :password, :on_disconnect
+
+    def initialize(*args)
+      super
+      @logger = Cabin::Channel.get
+      @connected = false
+      @closing_connection = false
+    end
+
+    def connection_completed
+      @connected = true
+      if @password
+        auth(@password).callback do |reply|
+          unless reply == 'OK'
+            @logger.fatal('redis authentication failed')
+            close_connection
+          end
+        end
+      end
+      info.callback do |reply|
+        redis_version = reply.split(/\n/).first.split(/:/).last.chomp
+        if redis_version < '1.3.14'
+          @logger.fatal('redis version must be >= 2.0 RC 1')
+          close_connection
+        end
+      end
+    end
+
+    def reconnect!
+      EM::Timer.new(1) do
+        reconnect(@host, @port)
+      end
+    end
+
+    def close
+      @closing_connection = true
+      close_connection
+    end
+
+    def unbind
+      @connected = false
+      super
+      if @on_disconnect && !@closing_connection
+        @on_disconnect.call
+      end
+    end
+
+    def connected?
+      @connected
+    end
+
+    def self.connect(options)
+      options ||= Hash.new
+      if options.is_a?(String)
+        begin
+          uri = URI.parse(options)
+          host = uri.host
+          port = uri.port || 6379
+          password = uri.password
+        rescue
+          @logger.fatal('invalid redis url')
+          @logger.fatal('SENSU NOT RUNNING!')
+          exit 2
+        end
+      else
+        host = options[:host] || 'localhost'
+        port = options[:port] || 6379
+        password = options[:password]
+      end
+      EM::connect(host, port, self) do |redis|
+        redis.host = host
+        redis.port = port
+        redis.password = password
+      end
+    end
+  end
+end

data/lib/sensu/server.rb

@@ -1,8 +1,5 @@
 require File.join(File.dirname(__FILE__), 'base')
-
-require 'redis'
-
-require File.join(File.dirname(__FILE__), 'patches', 'redis')
+require File.join(File.dirname(__FILE__), 'redis')
 
 module Sensu
   class Server
@@ -27,8 +24,8 @@ module Sensu
     end
 
     def initialize(options={})
+      @logger = Cabin::Channel.get
       base = Sensu::Base.new(options)
-      @logger = base.logger
       @settings = base.settings
       @timers = Array.new
       @handlers_in_progress = 0
@@ -38,7 +35,13 @@ module Sensu
       @logger.debug('connecting to redis', {
         :settings => @settings[:redis]
       })
-      @redis = Redis.connect(@settings[:redis])
+      @redis = Sensu::Redis.connect(@settings[:redis])
+      unless testing?
+        @redis.on_disconnect = Proc.new do
+          @logger.fatal('redis connection closed')
+          stop('TERM')
+        end
+      end
     end
 
     def setup_rabbitmq
@@ -63,7 +66,7 @@ module Sensu
       end
     end
 
-    def check_subdued?(check, subdue_type)
+    def check_subdued?(check, subdue_at)
       subdue = false
       if check[:subdue].is_a?(Hash)
         if check[:subdue].has_key?(:start) && check[:subdue].has_key?(:end)
@@ -93,8 +96,8 @@ module Sensu
         end
       end
       if subdue
-        (!check[:subdue].has_key?(:at) && subdue_type == :handler) ||
-          (check[:subdue].has_key?(:at) && check[:subdue][:at].to_sym == subdue_type)
+        (!check[:subdue].has_key?(:at) && subdue_at == :handler) ||
+          (check[:subdue].has_key?(:at) && check[:subdue][:at].to_sym == subdue_at)
       else
         false
       end
@@ -109,11 +112,8 @@ module Sensu
       else
         ['default']
       end
-      handler_list.reject! do |handler_name|
-        !@settings.handler_exists?(handler_name)
-      end
       handler_list.map! do |handler_name|
-        if @settings[:handlers][handler_name][:type] == 'set'
+        if @settings.handler_exists?(handler_name) && @settings[:handlers][handler_name][:type] == 'set'
           @settings[:handlers][handler_name][:handlers]
         else
           handler_name
@@ -122,7 +122,16 @@ module Sensu
       handler_list.flatten!
       handler_list.uniq!
       handler_list.reject! do |handler_name|
-        !@settings.handler_exists?(handler_name)
+        unless @settings.handler_exists?(handler_name)
+          @logger.warn('unknown handler', {
+            :handler => {
+              :name => handler_name
+            }
+          })
+          true
+        else
+          false
+        end
       end
       handler_list.map do |handler_name|
         @settings[:handlers][handler_name].merge(:name => handler_name)
@@ -131,31 +140,23 @@ module Sensu
 
     def handle_event(event)
       unless check_subdued?(event[:check], :handler)
-        report = proc do |output|
-          if output.is_a?(String)
-            output.split(/\n+/).each do |line|
-              @logger.info('handler output', {
-                :output => line
-              })
-            end
-          end
-          @handlers_in_progress -= 1
-        end
         handlers = check_handlers(event[:check])
         handlers.each do |handler|
-          @logger.debug('handling event', {
+          @logger.info('handling event', {
             :event => event,
             :handler => handler
           })
           @handlers_in_progress += 1
           case handler[:type]
           when 'pipe'
-            execute = proc do
+            execute = Proc.new do
               begin
                 IO.popen(handler[:command] + ' 2>&1', 'r+') do |io|
                   io.write(event.to_json)
                   io.close_write
-                  io.read
+                  io.read.split(/\n+/).each do |line|
+                    @logger.debug(line)
+                  end
                 end
               rescue Errno::ENOENT => error
                 @logger.error('handler does not exist', {
@@ -177,7 +178,10 @@ module Sensu
                 })
               end
             end
-            EM::defer(execute, report)
+            complete = Proc.new do
+              @handlers_in_progress -= 1
+            end
+            EM::defer(execute, complete)
           when 'amqp'
             exchange_name = handler[:exchange][:name]
             exchange_type = handler[:exchange].has_key?(:type) ? handler[:exchange][:type].to_sym : :direct
@@ -324,18 +328,18 @@ module Sensu
       end
     end
 
-    def setup_publisher(options={})
+    def setup_publisher
       @logger.debug('scheduling check requests')
       check_count = 0
-      stagger = options[:test] ? 0 : 7
+      stagger = testing? ? 0 : 7
       @settings.checks.each do |check|
         unless check[:publish] == false || check[:standalone]
           check_count += 1
           @timers << EM::Timer.new(stagger * check_count) do
-            interval = options[:test] ? 0.5 : check[:interval]
+            interval = testing? ? 0.5 : check[:interval]
             @timers << EM::PeriodicTimer.new(interval) do
               unless check_subdued?(check, :publisher)
-                unless @rabbitmq.reconnecting?
+                if @rabbitmq.connected?
                   payload = {
                     :name => check[:name],
                     :issued => Time.now.to_i
@@ -369,7 +373,7 @@ module Sensu
     def setup_keepalive_monitor
       @logger.debug('monitoring client keepalives')
       @timers << EM::PeriodicTimer.new(30) do
-        unless @rabbitmq.reconnecting?
+        if @rabbitmq.connected?
           @logger.debug('checking for stale client info')
           @redis.smembers('clients').callback do |clients|
             clients.each do |client_name|
@@ -382,17 +386,17 @@ module Sensu
                 time_since_last_keepalive = Time.now.to_i - client[:timestamp]
                 case
                 when time_since_last_keepalive >= 180
-                  check[:output] = 'No keep-alive sent from host in over 180 seconds'
+                  check[:output] = 'No keep-alive sent from client in over 180 seconds'
                   check[:status] = 2
                   publish_result(client, check)
                 when time_since_last_keepalive >= 120
-                  check[:output] = 'No keep-alive sent from host in over 120 seconds'
+                  check[:output] = 'No keep-alive sent from client in over 120 seconds'
                   check[:status] = 1
                   publish_result(client, check)
                 else
                   @redis.hexists('events:' + client[:name], 'keepalive').callback do |exists|
                     if exists
-                      check[:output] = 'Keep-alive sent from host'
+                      check[:output] = 'Keep-alive sent from client'
                       check[:status] = 0
                       publish_result(client, check)
                     end
@@ -434,7 +438,7 @@ module Sensu
     end
 
     def resign_as_master(&block)
-      if @is_master
+      if @redis.connected? && @is_master
         @redis.del('lock:master').callback do
           @logger.warn('resigned as master')
           if block
@@ -442,7 +446,6 @@ module Sensu
           end
         end
       else
-        @logger.warn('not currently master')
         if block
           block.call
         end
@@ -465,9 +468,7 @@ module Sensu
     def setup_rabbitmq_monitor
       @logger.debug('monitoring rabbitmq connection')
       @timers << EM::PeriodicTimer.new(5) do
-        if @rabbitmq.reconnecting?
-          @logger.warn('reconnecting to rabbitmq')
-        else
+        if @rabbitmq.connected?
           unless @keepalive_queue.subscribed?
             @logger.warn('re-subscribing to keepalives')
             setup_keepalives
@@ -476,23 +477,42 @@ module Sensu
             @logger.warn('re-subscribing to results')
             setup_results
           end
+        else
+          @logger.warn('reconnecting to rabbitmq')
+        end
+      end
+    end
+
+    def unsubscribe(&block)
+      if @rabbitmq.connected?
+        @logger.warn('unsubscribing from keepalives')
+        @keepalive_queue.unsubscribe do
+          @logger.warn('unsubscribing from results')
+          @result_queue.unsubscribe do
+            if block
+              block.call
+            end
+          end
+        end
+      else
+        if block
+          block.call
         end
       end
     end
 
-    def stop_reactor
+    def complete_handlers_in_progress(&block)
       @logger.info('completing handlers in progress', {
         :handlers_in_progress => @handlers_in_progress
       })
-      complete_in_progress = EM::tick_loop do
+      complete = EM::tick_loop do
         if @handlers_in_progress == 0
           :stop
         end
       end
-      complete_in_progress.on_stop do
-        @logger.warn('stopping reactor')
-        EM::PeriodicTimer.new(0.25) do
-          EM::stop_event_loop
+      complete.on_stop do
+        if block
+          block.call
         end
       end
     end
@@ -505,21 +525,21 @@ module Sensu
       @timers.each do |timer|
         timer.cancel
       end
-      unless @rabbitmq.reconnecting?
-        @logger.warn('unsubscribing from keepalives')
-        @keepalive_queue.unsubscribe do
-          @logger.warn('unsubscribing from results')
-          @result_queue.unsubscribe do
-            resign_as_master do
-              stop_reactor
-            end
-          end
-        end
-      else
+      unsubscribe do
         resign_as_master do
-          stop_reactor
+          complete_handlers_in_progress do
+            @redis.close
+            @logger.warn('stopping reactor')
+            EM::stop_event_loop
+          end
         end
       end
     end
+
+    private
+
+    def testing?
+      File.basename($0) == 'rake'
+    end
   end
 end

data/lib/sensu/settings.rb

@@ -172,74 +172,108 @@ module Sensu
       end
     end
 
+    def invalid(reason, details={})
+      @logger.fatal('invalid settings', {
+        :reason => reason
+      }.merge(details))
+      @logger.fatal('SENSU NOT RUNNING!')
+      exit 2
+    end
+
     def validate_checks
       unless @settings[:checks].is_a?(Hash)
-        raise('missing check configuration')
+        invalid('missing checks configuration')
       end
       checks.each do |check|
         unless check[:interval].is_a?(Integer) && check[:interval] > 0
-          raise('missing interval for check: ' + check[:name])
+          invalid('check is missing interval', {
+            :check => check
+          })
         end
         unless check[:command].is_a?(String)
-          raise('missing command for check: ' + check[:name])
+          invalid('check is missing command', {
+            :check => check
+          })
         end
         unless check[:standalone]
           unless check[:subscribers].is_a?(Array) && check[:subscribers].count > 0
-            raise('missing subscribers for check: ' + check[:name])
+            invalid('check is missing subscribers', {
+              :check => check
+            })
           end
           check[:subscribers].each do |subscriber|
             unless subscriber.is_a?(String) && !subscriber.empty?
-              raise('a check subscriber must be a string for check: ' + check[:name])
+              invalid('check subscribers must each be a string', {
+                :check => check
+              })
             end
           end
         end
         if check.has_key?(:handler)
           unless check[:handler].is_a?(String)
-            raise('handler must be a string for check: ' + check[:name])
+            invalid('check handler must be a string', {
+              :check => check
+            })
           end
         end
         if check.has_key?(:handlers)
           unless check[:handlers].is_a?(Array)
-            raise('handlers must be an array for check: ' + check[:name])
+            invalid('check handlers must be an array', {
+              :check => check
+            })
           end
         end
         if check.has_key?(:subdue)
           unless check[:subdue].is_a?(Hash)
-            raise('subdue must be a hash for check: ' + check[:name])
+            invalid('check subdue must be a hash', {
+              :check => check
+            })
           end
           if check[:subdue].has_key?(:start) || check[:subdue].has_key?(:end)
             begin
               Time.parse(check[:subdue][:start])
               Time.parse(check[:subdue][:end])
             rescue
-              raise('subdue start & end times must be valid for check: ' + check[:name])
+              invalid('check subdue start & end times must be valid', {
+                :check => check
+              })
             end
           end
           if check[:subdue].has_key?(:days)
             unless check[:subdue][:days].is_a?(Array)
-              raise('subdue days must be an array for check: ' + check[:name])
+              invalid('check subdue days must be an array', {
+                :check => check
+              })
             end
             check[:subdue][:days].each do |day|
               days = %w[sunday monday tuesday wednesday thursday friday saturday]
               unless day.is_a?(String) && days.include?(day.downcase)
-                raise('subdue days must be valid days of the week for check: ' + check[:name])
+                invalid('check subdue days must be valid days of the week', {
+                  :check => check
+                })
               end
             end
           end
           if check[:subdue].has_key?(:exceptions)
             unless check[:subdue][:exceptions].is_a?(Array)
-              raise('subdue exceptions must be an array for check: ' + check[:name])
+              invalid('check subdue exceptions must be an array', {
+                :check => check
+              })
             end
             check[:subdue][:exceptions].each do |exception|
               unless exception.is_a?(Hash)
-                raise('subdue exception items must be a hash for check: ' + check[:name])
+                invalid('check subdue exceptions must each be a hash', {
+                  :check => check
+                })
               end
               if exception.has_key?(:start) || exception.has_key?(:end)
                 begin
                   Time.parse(exception[:start])
                   Time.parse(exception[:end])
                 rescue
-                  raise('subdue exception start & end times must be valid for check: ' + check[:name])
+                  invalid('check subdue exception start & end times must be valid', {
+                    :check => check
+                  })
                 end
               end
             end
@@ -250,75 +284,89 @@ module Sensu
 
     def validate_client
       unless @settings[:client].is_a?(Hash)
-        raise('missing client configuration')
+        invalid('missing client configuration')
       end
       unless @settings[:client][:name].is_a?(String)
-        raise('client must have a name')
+        invalid('client must have a name')
       end
       unless @settings[:client][:address].is_a?(String)
-        raise('client must have an address')
+        invalid('client must have an address')
       end
       unless @settings[:client][:subscriptions].is_a?(Array) && @settings[:client][:subscriptions].count > 0
-        raise('client must have subscriptions')
+        invalid('client must have subscriptions')
       end
       @settings[:client][:subscriptions].each do |subscription|
         unless subscription.is_a?(String) && !subscription.empty?
-          raise('a client subscription must be a string')
+          invalid('client subscriptions must each be a string')
         end
       end
     end
 
     def validate_api
       unless @settings[:api].is_a?(Hash)
-        raise('missing api configuration')
+        invalid('missing api configuration')
       end
       unless @settings[:api][:port].is_a?(Integer)
-        raise('api port must be an integer')
+        invalid('api port must be an integer')
       end
       if @settings[:api].has_key?(:user) || @settings[:api].has_key?(:password)
         unless @settings[:api][:user].is_a?(String)
-          raise('api user must be a string')
+          invalid('api user must be a string')
         end
         unless @settings[:api][:password].is_a?(String)
-          raise('api password must be a string')
+          invalid('api password must be a string')
         end
       end
     end
 
     def validate_server
       unless @settings[:handlers].is_a?(Hash)
-        raise('missing handler configuration')
+        invalid('missing handlers configuration')
       end
       unless @settings[:handlers].include?(:default)
-        raise('missing default handler')
+        invalid('missing default handler')
       end
       handlers.each do |handler|
         unless handler[:type].is_a?(String)
-          raise('missing type for handler: ' + handler[:name])
+          invalid('handler is missing type', {
+            :handler => handler
+          })
         end
         case handler[:type]
         when 'pipe'
           unless handler[:command].is_a?(String)
-            raise('missing command for pipe handler: ' + handler[:name])
+            invalid('handler is missing command', {
+              :handler => handler
+            })
           end
         when 'amqp'
           unless handler[:exchange].is_a?(Hash)
-            raise('missing exchange details for amqp handler: ' + handler[:name])
+            invalid('handler is missing exchange hash', {
+              :handler => handler
+            })
           end
           unless handler[:exchange][:name].is_a?(String)
-            raise('missing exchange name for amqp handler: ' + handler[:name])
+            invalid('handler is missing exchange name', {
+              :handler => handler
+            })
           end
           if handler[:exchange].has_key?(:type)
             unless %w[direct fanout topic].include?(handler[:exchange][:type])
-              raise('invalid exchange type for amqp handler: ' + handler[:name])
+              invalid('handler exchange type is invalid', {
+                :handler => handler
+              })
             end
           end
         when 'set'
           unless handler[:handlers].is_a?(Array) && handler[:handlers].count > 0
-            raise('missing handler set for handler: ' + handler[:name])
+            invalid('handler set is missing handlers', {
+              :handler => handler
+            })
           end
         else
-          raise('unknown type for handler: ' + handler[:name])
+          invalid('unknown handler type', {
+            :handler => handler
+          })
         end
       end
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196235
+  hash: 62196233
   prerelease: true
   segments: 
   - 0
   - 9
   - 6
   - beta
-  - 4
-  version: 0.9.6.beta.4
+  - 5
+  version: 0.9.6.beta.5
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-19 00:00:00 -07:00
+date: 2012-05-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,10 +193,9 @@ files:
 - lib/sensu/client.rb
 - lib/sensu/constants.rb
 - lib/sensu/logger.rb
-- lib/sensu/patches/amqp.rb
-- lib/sensu/patches/redis.rb
 - lib/sensu/patches/ruby.rb
 - lib/sensu/process.rb
+- lib/sensu/redis.rb
 - lib/sensu/server.rb
 - lib/sensu/settings.rb
 - lib/sensu/socket.rb

data/lib/sensu/patches/amqp.rb

@@ -1,7 +0,0 @@
-module AMQP
-  module Client
-    def reconnecting?
-      @reconnecting || false
-    end
-  end
-end

data/lib/sensu/patches/redis.rb

@@ -1,71 +0,0 @@
-module Redis
-  class Client
-    attr_accessor :redis_host, :redis_port, :redis_password
-
-    def connection_completed
-      @connected = true
-      @reconnecting = false
-      if @redis_password
-        auth(@redis_password).callback do |reply|
-          unless reply == 'OK'
-            raise('could not authenticate')
-          end
-        end
-      end
-      info.callback do |reply|
-        redis_version = reply.split(/\n/).first.split(/:/).last.chomp
-        if redis_version < '1.3.14'
-          raise('redis version must be >= 2.0 RC 1')
-        end
-      end
-    end
-
-    def close
-      @closing_connection = true
-      close_connection_after_writing
-    end
-
-    def unbind
-      unless !@connected || @closing_connection
-        EM::Timer.new(1) do
-          @reconnecting = true
-          reconnect(@redis_host, @redis_port)
-        end
-      else
-        until @queue.empty?
-          @queue.shift.fail RuntimeError.new('connection closed')
-        end
-        unless @connected
-          raise('could not connect to redis')
-        end
-      end
-    end
-
-    def reconnecting?
-      @reconnecting || false
-    end
-  end
-
-  def self.connect(options)
-    options ||= Hash.new
-    if options.is_a?(String)
-      begin
-        uri = URI.parse(options)
-        host = uri.host
-        port = uri.port || 6379
-        password = uri.password
-      rescue
-        raise('invalid redis url')
-      end
-    else
-      host = options[:host] || 'localhost'
-      port = options[:port] || 6379
-      password = options[:password]
-    end
-    EM::connect(host, port, Redis::Client) do |client|
-      client.redis_host = host
-      client.redis_port = port
-      client.redis_password = password
-    end
-  end
-end