sensu 0.9.9.beta.4 → 0.9.9

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.9.9 - TBD
+## 0.9.9 - 2013-01-14
 
 ### Features
 

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.9.beta.4'
+    VERSION = '0.9.9'
 
     DEFAULT_OPTIONS = {
       :config_file => '/etc/sensu/config.json',

data/lib/sensu/io.rb

@@ -9,7 +9,7 @@ module Sensu
           if RUBY_VERSION < '1.9.3'
             child = ::IO.popen(command + ' 2>&1', mode)
             block.call(child)
-            wait_on_process(child)
+            wait_on_process(child, false)
           else
             options = {
               :err => [:child, :out]
@@ -34,22 +34,36 @@ module Sensu
             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
+          kill_process_group(child.pid)
+          wait_on_process_group(child.pid)
+          ['Execution timed out', 2]
         end
       end
 
       private
 
-      def wait_on_process(process)
+      def kill_process_group(group_id)
+        begin
+          ::Process.kill(9, -group_id)
+        rescue Errno::ESRCH, Errno::EPERM
+        end
+      end
+
+      def wait_on_process_group(group_id)
+        begin
+          loop do
+            ::Process.wait2(-group_id)
+          end
+        rescue Errno::ECHILD
+        end
+      end
+
+      def wait_on_process(process, wait_on_group=true)
         output = process.read
         _, status = ::Process.wait2(process.pid)
+        if wait_on_group
+          wait_on_process_group(process.pid)
+        end
         [output, status.exitstatus]
       end
     end

data/lib/sensu/server.rb

@@ -69,6 +69,7 @@ module Sensu
       end
       @rabbitmq.after_reconnect do
         @logger.info('reconnected to rabbitmq')
+        @amq.prefetch(1)
       end
       @amq = @rabbitmq.channel
       @amq.prefetch(1)
@@ -76,7 +77,10 @@ module Sensu
 
     def setup_keepalives
       @logger.debug('subscribing to keepalives')
-      @keepalive_queue = @amq.queue('keepalives')
+      @amq.queue('keepalives').consumers.each do |consumer_tag, consumer|
+        consumer.cancel
+      end
+      @keepalive_queue = @amq.queue!('keepalives')
       @keepalive_queue.subscribe(:ack => true) do |header, payload|
         client = JSON.parse(payload, :symbolize_names => true)
         @logger.debug('received keepalive', {
@@ -129,7 +133,7 @@ module Sensu
           true
         when hash_one[key].is_a?(Hash) && hash_two[key].is_a?(Hash)
           filter_attributes_match?(hash_one[key], hash_two[key])
-        when hash_one[key].is_a?(String) && hash_one[key].start_with?('eval: ')
+        when hash_one[key].is_a?(String) && hash_one[key].start_with?('eval:')
           begin
             expression = hash_one[key].gsub(/^eval:(\s+)?/, '')
             !!Sandbox.eval(expression, hash_two[key])
@@ -220,7 +224,7 @@ module Sensu
             event_filtered?(filter_name, event)
           end
           if filtered
-            @logger.debug('event filtered for handler', {
+            @logger.info('event filtered for handler', {
               :event => event,
               :handler => handler
             })
@@ -490,7 +494,10 @@ module Sensu
 
     def setup_results
       @logger.debug('subscribing to results')
-      @result_queue = @amq.queue('results')
+      @amq.queue('results').consumers.each do |consumer_tag, consumer|
+        consumer.cancel
+      end
+      @result_queue = @amq.queue!('results')
       @result_queue.subscribe(:ack => true) do |header, payload|
         result = JSON.parse(payload, :symbolize_names => true)
         @logger.debug('received result', {
@@ -703,6 +710,7 @@ module Sensu
       @keepalive_queue.unsubscribe
       @result_queue.unsubscribe
       if @rabbitmq.connected?
+        @amq.recover
         timestamp = Time.now.to_i
         retry_until_true do
           if !@keepalive_queue.subscribed? && !@result_queue.subscribed?

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 1725596175
-  prerelease: true
+  hash: 41
+  prerelease: false
   segments: 
   - 0
   - 9
   - 9
-  - beta
-  - 4
-  version: 0.9.9.beta.4
+  version: 0.9.9
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-13 00:00:00 -08:00
+date: 2013-01-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -233,14 +231,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: