sensu 0.9.9.beta.1 → 0.9.9.beta.2

data/CHANGELOG.md

@@ -11,6 +11,10 @@ Aggregate results available via the API when using a parameter
 Event filters; filtering events for handlers, using event attribute
 matching.
 
+TCP handler socket timeout, which defaults to 10 seconds.
+
+Check execution timeout.
+
 ### Other
 
 Server is now using basic AMQP QoS (prefetch), just enough back pressure.

data/lib/sensu/base.rb

@@ -4,6 +4,7 @@ gem 'eventmachine', '1.0.0'
 gem 'amqp', '0.9.7'
 
 require 'json'
+require 'timeout'
 require 'time'
 require 'uri'
 require 'amqp'
@@ -13,6 +14,7 @@ require File.join(File.dirname(__FILE__), 'cli')
 require File.join(File.dirname(__FILE__), 'logger')
 require File.join(File.dirname(__FILE__), 'settings')
 require File.join(File.dirname(__FILE__), 'process')
+require File.join(File.dirname(__FILE__), 'io')
 
 module Sensu
   class Base

data/lib/sensu/client.rb

@@ -102,10 +102,7 @@ module Sensu
           execute = Proc.new do
             started = Time.now.to_f
             begin
-              IO.popen(command + ' 2>&1') do |io|
-                check[:output] = io.read
-              end
-              check[:status] = $?.exitstatus
+              check[:output], check[:status] = Sensu::IO.popen(command, 'r', check[:timeout])
             rescue => error
               @logger.warn('unexpected error', {
                 :error => error.to_s
@@ -117,9 +114,7 @@ module Sensu
             check
           end
           publish = Proc.new do |check|
-            unless check[:status].nil?
-              publish_result(check)
-            end
+            publish_result(check)
             @checks_in_progress.delete(check[:name])
           end
           EM::defer(execute, publish)

data/lib/sensu/constants.rb

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

data/lib/sensu/io.rb

@@ -0,0 +1,55 @@
+module Sensu
+  class IO
+    class << self
+      def popen(command, mode='r', timeout=nil, &block)
+        block ||= Proc.new {}
+        begin
+          if RUBY_VERSION < '1.9.3'
+            child = ::IO.popen(command + ' 2>&1', mode)
+            block.call(child)
+            wait_on_process(child)
+          else
+            options = {
+              :err => [:child, :out]
+            }
+            case RUBY_PLATFORM
+            when /(ms|cyg|bcc)win|mingw|win32/
+              shell = ['cmd', '/c']
+              options[:new_pgroup] = true
+            else
+              shell = ['sh', '-c']
+              options[:pgroup] = true
+            end
+            child = ::IO.popen(shell + [command, options], mode)
+            if timeout
+              Timeout.timeout(timeout) do
+                block.call(child)
+                wait_on_process(child)
+              end
+            else
+              block.call(child)
+              wait_on_process(child)
+            end
+          end
+        rescue Timeout::Error
+          begin
+            ::Process.kill(9, -child.pid)
+            loop do
+              ::Process.wait2(-child.pid)
+            end
+          rescue Errno::ESRCH, Errno::ECHILD
+            ['Execution timed out', 2]
+          end
+        end
+      end
+
+      private
+
+      def wait_on_process(process)
+        output = process.read
+        _, status = ::Process.wait2(process.pid)
+        [output, status.exitstatus]
+      end
+    end
+  end
+end

data/lib/sensu/server.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), 'base')
 require File.join(File.dirname(__FILE__), 'redis')
+require File.join(File.dirname(__FILE__), 'socket')
 
 module Sensu
   class Server
@@ -232,15 +233,12 @@ module Sensu
       end
       execute = Proc.new do
         begin
-          output = ''
-          IO.popen(command + ' 2>&1', 'r+') do |io|
+          output, status = Sensu::IO.popen(command, 'r+') do |child|
             unless data.nil?
-              io.write(data.to_s)
+              child.write(data.to_s)
             end
-            io.close_write
-            output = io.read
+            child.close_write
           end
-          status = $?.exitstatus
           [true, output, status]
         rescue => error
           on_error.call(error)
@@ -278,13 +276,11 @@ module Sensu
             })
           end
           execute_command(mutator[:command], event.to_json, on_error) do |output, status|
-            if status != 0
-              @logger.warn('mutator had a non-zero exit status', {
-                :event => event,
-                :mutator => mutator
-              })
+            if status == 0
+              block.call(output)
+            else
+              on_error.call('non-zero exit status (' + status + '): ' + output)
             end
-            block.call(output)
           end
         else
           @logger.error('unknown mutator', {
@@ -324,10 +320,16 @@ module Sensu
             end
           when 'tcp'
             begin
-              EM::connect(handler[:socket][:host], handler[:socket][:port], nil) do |socket|
+              EM::connect(handler[:socket][:host], handler[:socket][:port], Sensu::SocketHandler) do |socket|
+                socket.on_success = Proc.new do
+                  @handlers_in_progress_count -= 1
+                end
+                socket.on_error = on_error
+                timeout = handler[:socket][:timeout] || 10
+                socket.pending_connect_timeout = timeout
+                socket.comm_inactivity_timeout = timeout
                 socket.send_data(event_data.to_s)
                 socket.close_connection_after_writing
-                @handlers_in_progress_count -= 1
               end
             rescue => error
               on_error.call(error)

data/lib/sensu/settings.rb

@@ -204,6 +204,13 @@ module Sensu
             end
           end
         end
+        if check.has_key?(:timeout)
+          unless check[:timeout].is_a?(Numeric)
+            invalid('check timeout must be numeric', {
+              :check => check
+            })
+          end
+        end
         if check.has_key?(:handler)
           unless check[:handler].is_a?(String)
             invalid('check handler must be a string', {
@@ -398,6 +405,13 @@ module Sensu
               :handler => handler
             })
           end
+          if handler[:socket].has_key?(:timeout)
+            unless handler[:socket][:timeout].is_a?(Integer)
+              invalid('handler socket timeout must be an integer', {
+                :handler => handler
+              })
+            end
+          end
         when 'amqp'
           unless handler[:exchange].is_a?(Hash)
             invalid('handler is missing exchange hash', {

data/lib/sensu/socket.rb

@@ -49,4 +49,26 @@ module Sensu
       end
     end
   end
+
+  class SocketHandler < EM::Connection
+    attr_accessor :on_success, :on_error
+
+    def connection_completed
+      @connected_at = Time.now.to_f
+      @inactivity_timeout = comm_inactivity_timeout
+    end
+
+    def unbind
+      if @connected_at
+        elapsed_time = Time.now.to_f - @connected_at
+        if elapsed_time >= @inactivity_timeout
+          @on_error.call('socket inactivity timeout')
+        else
+          @on_success.call('wrote to socket')
+        end
+      else
+        @on_error.call('failed to connect to socket')
+      end
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 1653984923
+  hash: -1743839652
   prerelease: true
   segments: 
   - 0
   - 9
   - 9
   - beta
-  - 1
-  version: 0.9.9.beta.1
+  - 2
+  version: 0.9.9.beta.2
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-06 00:00:00 -08:00
+date: 2013-01-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -198,6 +198,7 @@ files:
 - lib/sensu/client.rb
 - lib/sensu/process.rb
 - lib/sensu/cli.rb
+- lib/sensu/io.rb
 - lib/sensu/base.rb
 - lib/sensu/logger.rb
 - lib/sensu.rb