sensu 0.9.7.beta → 0.9.7.beta.1

data/CHANGELOG.md

@@ -10,3 +10,13 @@ sending to a handler.
 AMQP handlers can no longer use `"send_only_check_output": true`, but
 instead have access to the built-in mutators `"mutator": "only_check_output"` and
 `"mutator": "only_check_output_split"`.
+
+### Other
+
+Improved graceful process termination.
+
+Improved client socket ping/pong.
+
+Strict dependency version locking.
+
+Adjusted logging level for metric check results and events.

data/lib/sensu/api.rb

@@ -386,7 +386,9 @@ module Sensu
               $redis.sadd('stashes', 'test/test').callback do
                 Thin::Logging.silent = true
                 Thin::Server.start(self, $settings[:api][:port])
-                block.call
+                EM::add_timer(0.5) do
+                  block.call
+                end
               end
             end
           end

data/lib/sensu/base.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'eventmachine', '~> 1.0.0.beta.4'
+gem 'eventmachine', '1.0.0.rc.4'
 
 require 'optparse'
 require 'json'

data/lib/sensu/client.rb

@@ -67,7 +67,13 @@ module Sensu
         :client => @settings[:client][:name],
         :check => check
       }
-      @logger.info('publishing check result', {
+      log_level = :info
+      if @settings.check_exists?(check[:name])
+        if @settings[:checks][check[:name]][:type] == 'metric'
+          log_level = :debug
+        end
+      end
+      @logger.send(log_level, 'publishing check result', {
         :payload => payload
       })
       @amq.queue('results').publish(payload.to_json)
@@ -234,15 +240,10 @@ module Sensu
     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
+        @check_request_queue.unsubscribe
+      end
+      if block
+        block.call
       end
     end
 
@@ -250,14 +251,12 @@ module Sensu
       @logger.info('completing checks in progress', {
         :checks_in_progress => @checks_in_progress
       })
-      complete = EM::tick_loop do
-        if @checks_in_progress.empty?
-          :stop
-        end
-      end
-      complete.on_stop do
-        if block
-          block.call
+      if block
+        retry_until_true do
+          if @checks_in_progress.empty?
+            block.call
+            true
+          end
         end
       end
     end
@@ -283,5 +282,13 @@ module Sensu
     def testing?
       File.basename($0) == 'rake'
     end
+
+    def retry_until_true(wait=0.5, &block)
+      EM::add_timer(wait) do
+        unless block.call
+          retry_until_true(wait, &block)
+        end
+      end
+    end
   end
 end

data/lib/sensu/constants.rb

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

data/lib/sensu/server.rb

@@ -28,7 +28,7 @@ module Sensu
       base = Sensu::Base.new(options)
       @settings = base.settings
       @timers = Array.new
-      @handlers_in_progress = 0
+      @handlers_in_progress_count = 0
     end
 
     def setup_redis
@@ -176,7 +176,7 @@ module Sensu
                 io.close_write
                 mutated = io.read
               end
-              unless $?.exitstatus == 0
+              if $?.exitstatus != 0
                 @logger.warn('mutator had a non-zero exit status', {
                   :event => event,
                   :mutator => mutator
@@ -211,7 +211,7 @@ module Sensu
             :event => event,
             :handler => handler
           })
-          @handlers_in_progress += 1
+          @handlers_in_progress_count += 1
           case handler[:type]
           when 'pipe'
             execute = Proc.new do
@@ -235,19 +235,43 @@ module Sensu
               end
             end
             complete = Proc.new do
-              @handlers_in_progress -= 1
+              @handlers_in_progress_count -= 1
             end
             EM::defer(execute, complete)
+          when 'tcp', 'udp'
+            data = Proc.new do
+              mutate_event_data(handler, event)
+            end
+            write = Proc.new do |data|
+              begin
+                case handler[:type]
+                when 'tcp'
+                  EM::connect(handler[:socket][:host], handler[:socket][:port], nil) do |socket|
+                    socket.send_data(data)
+                    socket.close_connection_after_writing
+                  end
+                when 'udp'
+                  EM::open_datagram_socket('127.0.0.1', 0, nil) do |socket|
+                    socket.send_datagram(data, handler[:socket][:host], handler[:socket][:port])
+                    socket.close_connection_after_writing
+                  end
+                end
+              rescue => error
+                @logger.error('handler error', {
+                  :event => event,
+                  :handler => handler,
+                  :error => error.to_s
+                })
+              end
+              @handlers_in_progress_count -= 1
+            end
+            EM::defer(data, write)
           when 'amqp'
             exchange_name = handler[:exchange][:name]
             exchange_type = handler[:exchange].has_key?(:type) ? handler[:exchange][:type].to_sym : :direct
             exchange_options = handler[:exchange].reject do |key, value|
               [:name, :type].include?(key)
             end
-            @logger.debug('publishing event to an amqp exchange', {
-              :event => event,
-              :exchange => handler[:exchange]
-            })
             payloads = Proc.new do
               Array(mutate_event_data(handler, event))
             end
@@ -257,14 +281,14 @@ module Sensu
                   @amq.method(exchange_type).call(exchange_name, exchange_options).publish(payload)
                 end
               end
-              @handlers_in_progress -= 1
+              @handlers_in_progress_count -= 1
             end
             EM::defer(payloads, publish)
           when 'set'
             @logger.error('handler sets cannot be nested', {
               :handler => handler
             })
-            @handlers_in_progress -= 1
+            @handlers_in_progress_count -= 1
           end
         end
       end
@@ -504,8 +528,19 @@ module Sensu
       if @redis.connected? && @is_master
         @redis.del('lock:master').callback do
           @logger.warn('resigned as master')
-          if block
-            block.call
+          @is_master = false
+        end
+        if block
+          timestamp = Time.now.to_i
+          retry_until_true do
+            if !@is_master
+              block.call
+              true
+            elsif Time.now.to_i - timestamp >= 5
+              @logger.warn('failed to resign as master')
+              block.call
+              true
+            end
           end
         end
       else
@@ -549,11 +584,19 @@ module Sensu
     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
+        @keepalive_queue.unsubscribe
+        @logger.warn('unsubscribing from results')
+        @result_queue.unsubscribe
+        if block
+          timestamp = Time.now.to_i
+          retry_until_true do
+            if !@keepalive_queue.subscribed? && !@result_queue.subscribed?
+              block.call
+              true
+            elsif Time.now.to_i - timestamp >= 5
+              @logger.warn('failed to unsubscribe from keepalives and results')
               block.call
+              true
             end
           end
         end
@@ -566,16 +609,14 @@ module Sensu
 
     def complete_handlers_in_progress(&block)
       @logger.info('completing handlers in progress', {
-        :handlers_in_progress => @handlers_in_progress
+        :handlers_in_progress_count => @handlers_in_progress_count
       })
-      complete = EM::tick_loop do
-        if @handlers_in_progress == 0
-          :stop
-        end
-      end
-      complete.on_stop do
-        if block
-          block.call
+      if block
+        retry_until_true do
+          if @handlers_in_progress_count == 0
+            block.call
+            true
+          end
         end
       end
     end
@@ -604,5 +645,13 @@ module Sensu
     def testing?
       File.basename($0) == 'rake'
     end
+
+    def retry_until_true(wait=0.5, &block)
+      EM::add_timer(wait) do
+        unless block.call
+          retry_until_true(wait, &block)
+        end
+      end
+    end
   end
 end

data/lib/sensu/settings.rb

@@ -334,6 +334,22 @@ module Sensu
               :handler => handler
             })
           end
+        when 'tcp', 'udp'
+          unless handler[:socket].is_a?(Hash)
+            invalid('handler is missing socket hash', {
+              :handler => handler
+            })
+          end
+          unless handler[:socket][:host].is_a?(String)
+            invalid('handler is missing socket host', {
+              :handler => handler
+            })
+          end
+          unless handler[:socket][:port].is_a?(Integer)
+            invalid('handler is missing socket port', {
+              :handler => handler
+            })
+          end
         when 'amqp'
           unless handler[:exchange].is_a?(Hash)
             invalid('handler is missing exchange hash', {

data/lib/sensu/socket.rb

@@ -9,7 +9,7 @@ module Sensu
     end
 
     def receive_data(data)
-      if data == 'ping'
+      if data.strip == 'ping'
         @logger.debug('socket received ping')
         reply('pong')
       else

data/sensu.gemspec

@@ -5,20 +5,20 @@ Gem::Specification.new do |s|
   s.version     = Sensu::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Sean Porter', 'Justin Kolberg']
-  s.email       = ['sean.porter@sonian.net', 'justin.kolberg@sonian.net']
+  s.email       = ['portertech@gmail.com', 'justin.kolberg@sonian.net']
   s.homepage    = 'https://github.com/sensu/sensu'
   s.summary     = 'A monitoring framework'
   s.description = 'A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.'
   s.license     = 'MIT'
   s.has_rdoc    = false
 
-  s.add_dependency('eventmachine', '~> 1.0.0.beta.4')
+  s.add_dependency('eventmachine', '1.0.0.rc.4')
   s.add_dependency('amqp', '0.7.4')
-  s.add_dependency('json')
+  s.add_dependency('json', '1.7.3')
   s.add_dependency('cabin', '0.4.4')
-  s.add_dependency('ruby-redis')
+  s.add_dependency('ruby-redis', '0.0.2')
   s.add_dependency('async_sinatra', '1.0.0')
-  s.add_dependency('thin')
+  s.add_dependency('thin', '1.4.1')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('em-spec')

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 31098133
+  hash: 62196233
   prerelease: true
   segments: 
   - 0
   - 9
   - 7
   - beta
-  version: 0.9.7.beta
+  - 1
+  version: 0.9.7.beta.1
 platform: ruby
 authors: 
 - Sean Porter
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-18 00:00:00 -07:00
+date: 2012-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,16 +27,16 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196363
+        hash: 15424061
         segments: 
         - 1
         - 0
         - 0
-        - beta
+        - rc
         - 4
-        version: 1.0.0.beta.4
+        version: 1.0.0.rc.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -60,12 +61,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 7
+        - 3
+        version: 1.7.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -90,12 +93,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 2
+        version: 0.0.2
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -120,12 +125,14 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 1
+        version: 1.4.1
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -172,7 +179,7 @@ dependencies:
   version_requirements: *id010
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
-- sean.porter@sonian.net
+- portertech@gmail.com
 - justin.kolberg@sonian.net
 executables: 
 - sensu-api