sensu 0.9.0 → 0.9.1

data/README.org

@@ -35,6 +35,6 @@
   - [[http://twitter.com/amdprophet][Justin Kolberg]]
   - [[http://twitter.com/kartar][James Turnbull]]
   - [[http://twitter.com/joshpasqualetto][Josh Pasqualetto]]
-  - Steve Lum
+  - [[http://github.com/lum][Steve Lum]]
   - [[http://twitter.com/miller_joe][Joe Miller]]
   - [[http://twitter.com/decklin][Decklin Foster]]

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/sensu/api.rb

@@ -3,14 +3,14 @@ require File.join(File.dirname(__FILE__), 'config')
 require 'sinatra/async'
 require 'redis'
 
-require File.join(File.dirname(__FILE__), 'helpers', 'redis')
+require File.join(File.dirname(__FILE__), 'patches', 'redis')
 
 module Sensu
   class API < Sinatra::Base
     register Sinatra::Async
 
     def self.run(options={})
-      EM.run do
+      EM::run do
         self.setup(options)
         self.run!(:port => $settings.api.port)
 
@@ -39,13 +39,6 @@ module Sensu
       $amq = AMQP::Channel.new(rabbitmq)
     end
 
-    def self.stop(signal)
-      $logger.warn('[process] -- ' + signal + ' -- stopping sensu api')
-      EM.add_timer(1) do
-        EM.stop
-      end
-    end
-
     before do
       content_type 'application/json'
     end
@@ -90,7 +83,7 @@ module Sensu
               }
               $amq.queue('results').publish({:client => client, :check => check}.to_json)
             end
-            EM.add_timer(8) do
+            EM::Timer.new(5) do
               $redis.srem('clients', client)
               $redis.del('events:' + client)
               $redis.del('client:' + client)
@@ -253,7 +246,7 @@ module Sensu
       end
     end
 
-    def self.test(options={})
+    def self.create_test_scaffolding(options={})
       self.setup(options)
       $settings.client.timestamp = Time.now.to_i
       $redis.set('client:' + $settings.client.name, $settings.client.to_json).callback do
@@ -271,5 +264,12 @@ module Sensu
         end
       end
     end
+
+    def self.stop(signal)
+      $logger.warn('[stop] -- stopping sensu api -- ' + signal)
+      EM::Timer.new(1) do
+        EM::stop_event_loop
+      end
+    end
   end
 end

data/lib/sensu/client.rb

@@ -10,7 +10,7 @@ module Sensu
       if options[:pid_file]
         Process.write_pid(options[:pid_file])
       end
-      EM.run do
+      EM::run do
         client.setup_amqp
         client.setup_keepalives
         client.setup_subscriptions
@@ -31,13 +31,6 @@ module Sensu
       @logger = config.logger || config.open_log
     end
 
-    def stop(signal)
-      @logger.warn('[stop] -- stopping sensu client -- ' + signal)
-      EM.add_timer(1) do
-        EM.stop
-      end
-    end
-
     def setup_amqp
       @logger.debug('[amqp] -- connecting to rabbitmq')
       rabbitmq = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
@@ -53,13 +46,13 @@ module Sensu
     def setup_keepalives
       @logger.debug('[keepalive] -- setup keepalives')
       publish_keepalive
-      EM.add_periodic_timer(30) do
+      EM::PeriodicTimer.new(30) do
         publish_keepalive
       end
     end
 
     def publish_result(check)
-      @logger.info('[result] -- publishing check result -- ' + check.status.to_s + ' -- ' + check.name)
+      @logger.info('[result] -- publishing check result -- ' + [check.name, check.status, check.output].join(' -- '))
       @amq.queue('results').publish({
         :client => @settings.client.name,
         :check => check.to_hash
@@ -95,7 +88,7 @@ module Sensu
               end
               @checks_in_progress.delete(check.name)
             end
-            EM.defer(execute, publish)
+            EM::defer(execute, publish)
           else
             @logger.warn('[execute] -- missing client attributes -- ' + unmatched_tokens.join(', ') + ' -- ' + check.name)
             check.status = 3
@@ -160,11 +153,11 @@ module Sensu
 
     def setup_queue_monitor
       @logger.debug('[monitor] -- setup queue monitor')
-      EM.add_periodic_timer(5) do
+      EM::PeriodicTimer.new(5) do
         unless @check_queue.subscribed?
           @logger.warn('[monitor] -- re-subscribing to subscriptions')
           @check_queue.delete
-          EM.add_timer(1) do
+          EM::Timer.new(1) do
             setup_subscriptions
           end
         end
@@ -173,12 +166,19 @@ module Sensu
 
     def setup_socket
       @logger.debug('[socket] -- starting up socket')
-      EM.start_server('127.0.0.1', 3030, ClientSocket) do |socket|
+      EM::start_server('127.0.0.1', 3030, ClientSocket) do |socket|
         socket.settings = @settings
         socket.logger = @logger
         socket.amq = @amq
       end
     end
+
+    def stop(signal)
+      @logger.warn('[stop] -- stopping sensu client -- ' + signal)
+      EM::Timer.new(1) do
+        EM::stop_event_loop
+      end
+    end
   end
 
   class ClientSocket < EM::Connection
@@ -198,7 +198,7 @@ module Sensu
             :check => check.to_hash
           }.to_json)
         else
-          @logger.warn('[socket] -- a check name, exit status, and output are required -- e.g. {"name": "x", "status": 0, output: "y"}')
+          @logger.warn('[socket] -- a check name, exit status, and output are required -- e.g. {"name": "x", "status": 0, "output": "y"}')
         end
       rescue JSON::ParserError => error
         @logger.warn('[socket] -- check result must be valid JSON: ' + error.to_s)

data/lib/sensu/config.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'helpers', 'ruby')
+require File.join(File.dirname(__FILE__), 'patches', 'ruby')
 
 require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'bundler'
@@ -38,6 +38,10 @@ module Sensu
       end
     end
 
+    def invalid_config(message)
+      raise 'configuration invalid, ' + message
+    end
+
     def open_log
       @logger = Cabin::Channel.new
       if File.writable?(@options[:log_file]) || !File.exist?(@options[:log_file]) && File.writable?(File.dirname(@options[:log_file]))
@@ -89,31 +93,6 @@ module Sensu
       end
     end
 
-    def validate_config
-      if @logger
-        @logger.debug('[config] -- validating configuration')
-      end
-      has_keys(%w[rabbitmq checks])
-      validate_common_config
-      case @options[:service]
-      when 'rake'
-        has_keys(%w[redis api handlers client])
-        validate_server_config
-        validate_client_config
-      when 'sensu-server'
-        has_keys(%w[redis handlers])
-        validate_server_config
-      when 'sensu-api'
-        has_keys(%w[redis api])
-      when 'sensu-client'
-        has_keys(%w[client])
-        validate_client_config
-      end
-      if @logger
-        @logger.debug('[config] -- configuration valid -- running ' + @options[:service])
-      end
-    end
-
     def validate_common_config
       @settings.checks.each do |name, details|
         unless details.interval.is_a?(Integer) && details.interval > 0
@@ -149,7 +128,7 @@ module Sensu
         unless details.key?('type')
           invalid_config('missing type for handler ' + name)
         end
-        case details.type
+        case details['type']
         when 'pipe'
           unless details.key?('command')
             invalid_config('missing command for pipe handler ' + name)
@@ -187,8 +166,29 @@ module Sensu
       end
     end
 
-    def invalid_config(message)
-      raise 'configuration invalid, ' + message
+    def validate_config
+      if @logger
+        @logger.debug('[config] -- validating configuration')
+      end
+      has_keys(%w[rabbitmq checks])
+      validate_common_config
+      case @options[:service]
+      when 'rake'
+        has_keys(%w[redis api handlers client])
+        validate_server_config
+        validate_client_config
+      when 'sensu-server'
+        has_keys(%w[redis handlers])
+        validate_server_config
+      when 'sensu-api'
+        has_keys(%w[redis api])
+      when 'sensu-client'
+        has_keys(%w[client])
+        validate_client_config
+      end
+      if @logger
+        @logger.debug('[config] -- configuration valid -- running ' + @options[:service])
+      end
     end
 
     def self.read_arguments(arguments)

data/lib/sensu/{helpers → patches}/redis.rb

@@ -12,7 +12,7 @@ module Redis
 
     def unbind
       unless !@connected || @closing_connection
-        EM.add_timer(1) do
+        EM::Timer.new(1) do
           reconnect(@host, @port)
         end
       else
@@ -26,6 +26,6 @@ module Redis
   def self.connect(options={})
     host = options[:host] || 'localhost'
     port = options[:port] || 6379
-    EM.connect(host, port, Redis::Client)
+    EM::connect(host, port, Redis::Client)
   end
 end

data/lib/sensu/server.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'config')
 
 require 'redis'
 
-require File.join(File.dirname(__FILE__), 'helpers', 'redis')
+require File.join(File.dirname(__FILE__), 'patches', 'redis')
 
 module Sensu
   class Server
@@ -16,8 +16,8 @@ module Sensu
       if options[:pid_file]
         Process.write_pid(options[:pid_file])
       end
-      EM.threadpool_size = 16
-      EM.run do
+      EM::threadpool_size = 16
+      EM::run do
         server.setup_redis
         server.setup_amqp
         server.setup_keepalives
@@ -37,17 +37,7 @@ module Sensu
       config = Sensu::Config.new(options)
       @settings = config.settings
       @logger = config.logger || config.open_log
-      @status = nil
-    end
-
-    def stop_reactor
-      EM.add_timer(3) do
-        EM.stop
-      end
-    end
-
-    def stopping?
-      @status == :stopping
+      @timers = Array.new
     end
 
     def setup_redis
@@ -91,8 +81,8 @@ module Sensu
         if @settings.handlers.key?(handler)
           @logger.debug('[event] -- handling event -- ' + [handler, event.client.name, event.check.name].join(' -- '))
           details = @settings.handlers[handler]
-          case details.type
-          when "pipe"
+          case details['type']
+          when 'pipe'
             handle = proc do
               output = ''
               Bundler.with_clean_env do
@@ -108,12 +98,12 @@ module Sensu
               end
               output
             end
-            EM.defer(handle, report)
-          when "amqp"
+            EM::defer(handle, report)
+          when 'amqp'
             exchange = details.exchange.name
-            exchange_type = details.exchange.key?('type') ? details.exchange.type.to_sym : :direct
+            exchange_type = details.exchange.key?('type') ? details.exchange['type'].to_sym : :direct
             exchange_options = details.exchange.reject { |key, value| %w[name type].include?(key) }
-            @logger.debug('[event] -- publishing event to amqp exchange -- ' + [exchange, event.client.name, event.check.name].join(' -- '))
+            @logger.debug('[event] -- publishing event to rabbitmq exchange -- ' + [exchange, event.client.name, event.check.name].join(' -- '))
             payload = details.send_only_check_output ? event.check.output : event.to_json
             @amq.method(exchange_type).call(exchange, exchange_options).publish(payload)
           end
@@ -134,7 +124,7 @@ module Sensu
             :check => check,
             :occurrences => 1
           })
-          if check.type == 'metric'
+          if check['type'] == 'metric'
             handle_event(event)
           else
             history_key = 'history:' + client.name + ':' + check.name
@@ -214,7 +204,7 @@ module Sensu
       @result_queue = @amq.queue('results')
       @result_queue.subscribe do |result_json|
         result = Hashie::Mash.new(JSON.parse(result_json))
-        @logger.info('[result] -- received result -- ' + [result.check.name, result.client, result.check.status, result.check.output].join(' -- '))
+        @logger.info('[result] -- received result -- ' + [result.client, result.check.name, result.check.status, result.check.output].join(' -- '))
         process_result(result)
       end
     end
@@ -225,7 +215,7 @@ module Sensu
       @settings.checks.each_with_index do |(name, details), index|
         check_request = Hashie::Mash.new({:name => name})
         unless details.publish == false
-          EM.add_timer(stagger*index) do
+          @timers << EM::Timer.new(stagger*index) do
             details.subscribers.each do |target|
               if target.is_a?(Hash)
                 @logger.debug('[publisher] -- check requires matching -- ' + target.to_hash.to_s + ' -- ' + name)
@@ -235,12 +225,10 @@ module Sensu
                 exchange = target
               end
               interval = options[:test] ? 0.5 : details.interval
-              EM.add_periodic_timer(interval) do
-                unless stopping?
-                  check_request.issued = Time.now.to_i
-                  @logger.info('[publisher] -- publishing check -- ' + name + ' -- ' + exchange)
-                  @amq.fanout(exchange).publish(check_request.to_json)
-                end
+              @timers << EM::PeriodicTimer.new(interval) do
+                check_request.issued = Time.now.to_i
+                @logger.info('[publisher] -- publishing check request -- ' + name + ' -- ' + exchange)
+                @amq.fanout(exchange).publish(check_request.to_json)
               end
             end
           end
@@ -250,37 +238,35 @@ module Sensu
 
     def setup_keepalive_monitor
       @logger.debug('[keepalive] -- setup keepalive monitor')
-      EM.add_periodic_timer(30) do
-        unless stopping?
-          @logger.debug('[keepalive] -- checking for stale clients')
-          @redis.smembers('clients').callback do |clients|
-            clients.each do |client_id|
-              @redis.get('client:' + client_id).callback do |client_json|
-                client = Hashie::Mash.new(JSON.parse(client_json))
-                time_since_last_keepalive = Time.now.to_i - client.timestamp
-                result = Hashie::Mash.new({
-                  :client => client.name,
-                  :check => {
-                    :name => 'keepalive',
-                    :issued => Time.now.to_i
-                  }
-                })
-                case
-                when time_since_last_keepalive >= 180
-                  result.check.status = 2
-                  result.check.output = 'No keep-alive sent from host in over 180 seconds'
-                  @amq.queue('results').publish(result.to_json)
-                when time_since_last_keepalive >= 120
-                  result.check.status = 1
-                  result.check.output = 'No keep-alive sent from host in over 120 seconds'
-                  @amq.queue('results').publish(result.to_json)
-                else
-                  @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
-                    if exists
-                      result.check.status = 0
-                      result.check.output = 'Keep-alive sent from host'
-                      @amq.queue('results').publish(result.to_json)
-                    end
+      @timers << EM::PeriodicTimer.new(30) do
+        @logger.debug('[keepalive] -- checking for stale clients')
+        @redis.smembers('clients').callback do |clients|
+          clients.each do |client_id|
+            @redis.get('client:' + client_id).callback do |client_json|
+              client = Hashie::Mash.new(JSON.parse(client_json))
+              time_since_last_keepalive = Time.now.to_i - client.timestamp
+              result = Hashie::Mash.new({
+                :client => client.name,
+                :check => {
+                  :name => 'keepalive',
+                  :issued => Time.now.to_i
+                }
+              })
+              case
+              when time_since_last_keepalive >= 180
+                result.check.status = 2
+                result.check.output = 'No keep-alive sent from host in over 180 seconds'
+                @amq.queue('results').publish(result.to_json)
+              when time_since_last_keepalive >= 120
+                result.check.status = 1
+                result.check.output = 'No keep-alive sent from host in over 120 seconds'
+                @amq.queue('results').publish(result.to_json)
+              else
+                @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
+                  if exists
+                    result.check.status = 0
+                    result.check.output = 'Keep-alive sent from host'
+                    @amq.queue('results').publish(result.to_json)
                   end
                 end
               end
@@ -320,39 +306,44 @@ module Sensu
 
     def setup_master_monitor
       request_master_election
-      EM.add_periodic_timer(20) do
-        unless stopping?
-          if @is_master
-            timestamp = Time.now.to_i
-            @redis.set('lock:master', timestamp).callback do
-              @logger.debug('[master] -- updated master lock timestamp -- ' + timestamp.to_s)
-            end
-          else
-            request_master_election
+      @timers << EM::PeriodicTimer.new(20) do
+        if @is_master
+          timestamp = Time.now.to_i
+          @redis.set('lock:master', timestamp).callback do
+            @logger.debug('[master] -- updated master lock timestamp -- ' + timestamp.to_s)
           end
+        else
+          request_master_election
         end
       end
     end
 
     def setup_queue_monitor
       @logger.debug('[monitor] -- setup queue monitor')
-      EM.add_periodic_timer(5) do
-        unless stopping?
-          unless @keepalive_queue.subscribed?
-            @logger.warn('[monitor] -- re-subscribing to rabbitmq queue -- keepalives')
-            setup_keepalives
-          end
-          unless @result_queue.subscribed?
-            @logger.warn('[monitor] -- re-subscribing to rabbitmq queue -- results')
-            setup_results
-          end
+      @timers << EM::PeriodicTimer.new(5) do
+        unless @keepalive_queue.subscribed?
+          @logger.warn('[monitor] -- re-subscribing to rabbitmq queue -- keepalives')
+          setup_keepalives
+        end
+        unless @result_queue.subscribed?
+          @logger.warn('[monitor] -- re-subscribing to rabbitmq queue -- results')
+          setup_results
         end
       end
     end
 
+    def stop_reactor
+      @logger.warn('[stop] -- stopping reactor')
+      EM::Timer.new(3) do
+        EM::stop_event_loop
+      end
+    end
+
     def stop(signal)
       @logger.warn('[stop] -- stopping sensu server -- ' + signal)
-      @status = :stopping
+      @timers.each do |timer|
+        timer.cancel
+      end
       @keepalive_queue.unsubscribe do
         @logger.warn('[stop] -- unsubscribed from rabbitmq queue -- keepalives')
         @result_queue.unsubscribe do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-23 00:00:00 -08:00
+date: 2011-12-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -230,8 +230,8 @@ files:
 - lib/sensu/api.rb
 - lib/sensu/client.rb
 - lib/sensu/config.rb
-- lib/sensu/helpers/redis.rb
-- lib/sensu/helpers/ruby.rb
+- lib/sensu/patches/redis.rb
+- lib/sensu/patches/ruby.rb
 - lib/sensu/server.rb
 - lib/sensu.rb
 - sensu.gemspec