sensu 0.9.12.beta.2 → 0.9.12.beta.3

data/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ### Features
 
+Extension stop hook for clean up before the event loop is stopped.
+
 Check extensions.
 
 ### Non-backwards compatible changes
@@ -10,6 +12,10 @@ No longer defaults to or enforces a specific config file or directory.
 
 ### Other
 
+Improved RabbitMQ queue unsubscribe & connection reconnect.
+
+Fixed keepalive check history & flap detection.
+
 Running on Ruby 2.0.0p0.
 
 Faster JSON parser.

data/lib/sensu/client.rb

@@ -242,10 +242,15 @@ module Sensu
       end
     end
 
-    def unsubscribe(&block)
+    def unsubscribe
       @logger.warn('unsubscribing from client subscriptions')
-      @check_request_queue.unsubscribe
-      block.call
+      if @rabbitmq.connected?
+        @check_request_queue.unsubscribe
+      else
+        @check_request_queue.before_recovery do
+          @check_request_queue.unsubscribe
+        end
+      end
     end
 
     def complete_checks_in_progress(&block)
@@ -273,8 +278,9 @@ module Sensu
       @timers.each do |timer|
         timer.cancel
       end
-      unsubscribe do
-        complete_checks_in_progress do
+      unsubscribe
+      complete_checks_in_progress do
+        @extensions.stop_all do
           @rabbitmq.close
           @logger.warn('stopping reactor')
           EM::stop_event_loop

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.12.beta.2'
+    VERSION = '0.9.12.beta.3'
 
     LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
 

data/lib/sensu/extensions.rb

@@ -53,6 +53,25 @@ module Sensu
       end
     end
 
+    def stop_all(&block)
+      all = @extensions.map do |category, extensions|
+        extensions.map do |name, extension|
+          extension
+        end
+      end
+      all.flatten!
+      stopper = Proc.new do |extension|
+        if extension.nil?
+          block.call
+        else
+          extension.stop do
+            stopper.call(all.pop)
+          end
+        end
+      end
+      stopper.call(all.pop)
+    end
+
     private
 
     def loaded(type, name, description)
@@ -93,6 +112,10 @@ module Sensu
         block.call('noop', 0)
       end
 
+      def stop(&block)
+        block.call
+      end
+
       def self.descendants
         ObjectSpace.each_object(Class).select do |klass|
           klass < self

data/lib/sensu/server.rb

@@ -41,8 +41,8 @@ module Sensu
         stop
       end
       @redis.before_reconnect do
-        @logger.warn('reconnecting to redis')
         unless testing?
+          @logger.warn('reconnecting to redis')
           pause
         end
       end
@@ -64,12 +64,15 @@ module Sensu
         stop
       end
       @rabbitmq.before_reconnect do
-        @logger.warn('reconnecting to rabbitmq')
-        resign_as_master
+        unless testing?
+          @logger.warn('reconnecting to rabbitmq')
+          pause
+        end
       end
       @rabbitmq.after_reconnect do
         @logger.info('reconnected to rabbitmq')
         @amq.prefetch(1)
+        resume
       end
       @amq = @rabbitmq.channel
       @amq.prefetch(1)
@@ -77,9 +80,6 @@ module Sensu
 
     def setup_keepalives
       @logger.debug('subscribing to keepalives')
-      @amq.queue('keepalives').consumers.each do |consumer_tag, consumer|
-        consumer.cancel
-      end
       @keepalive_queue = @amq.queue!('keepalives')
       @keepalive_queue.bind(@amq.direct('keepalives'))
       @keepalive_queue.subscribe(:ack => true) do |header, payload|
@@ -502,9 +502,6 @@ module Sensu
 
     def setup_results
       @logger.debug('subscribing to results')
-      @amq.queue('results').consumers.each do |consumer_tag, consumer|
-        consumer.cancel
-      end
       @result_queue = @amq.queue!('results')
       @result_queue.bind(@amq.direct('results'))
       @result_queue.subscribe(:ack => true) do |header, payload|
@@ -684,7 +681,7 @@ module Sensu
           @redis.set('lock:master', Time.now.to_i) do
             @logger.debug('updated master lock timestamp')
           end
-        elsif @rabbitmq.connected?
+        else
           request_master_election
         end
       end
@@ -697,7 +694,7 @@ module Sensu
         @master_timers.each do |timer|
           timer.cancel
         end
-        @master_timers = Array.new
+        @master_timers.clear
         if @redis.connected?
           @redis.del('lock:master') do
             @logger.info('removed master lock')
@@ -722,25 +719,19 @@ module Sensu
       end
     end
 
-    def unsubscribe(&block)
+    def unsubscribe
       @logger.warn('unsubscribing from keepalive and result queues')
-      @keepalive_queue.unsubscribe
-      @result_queue.unsubscribe
       if @rabbitmq.connected?
+        @keepalive_queue.unsubscribe
+        @result_queue.unsubscribe
         @amq.recover
-        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 keepalive and result queues')
-            block.call
-            true
-          end
-        end
       else
-        block.call
+        @keepalive_queue.before_recovery do
+          @keepalive_queue.unsubscribe
+        end
+        @result_queue.before_recovery do
+          @result_queue.unsubscribe
+        end
       end
     end
 
@@ -775,13 +766,12 @@ module Sensu
         @timers.each do |timer|
           timer.cancel
         end
-        @timers = Array.new
-        unsubscribe do
-          resign_as_master do
-            @state = :paused
-            if block
-              block.call
-            end
+        @timers.clear
+        unsubscribe
+        resign_as_master do
+          @state = :paused
+          if block
+            block.call
           end
         end
       end
@@ -803,10 +793,12 @@ module Sensu
       @state = :stopping
       pause do
         complete_handlers_in_progress do
-          @redis.close
-          @rabbitmq.close
-          @logger.warn('stopping reactor')
-          EM::stop_event_loop
+          @extensions.stop_all do
+            @redis.close
+            @rabbitmq.close
+            @logger.warn('stopping reactor')
+            EM::stop_event_loop
+          end
         end
       end
     end

data/lib/sensu/settings.rb

@@ -81,7 +81,7 @@ module Sensu
       @logger.debug('loading config file', {
         :config_file => file
       })
-      if File.readable?(file)
+      if File.file?(file) && File.readable?(file)
         begin
           contents = File.open(file, 'r').read
           config = Oj.load(contents)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: -3791266186
+  hash: 2789372299
   prerelease: true
   segments: 
   - 0
   - 9
   - 12
   - beta
-  - 2
-  version: 0.9.12.beta.2
+  - 3
+  version: 0.9.12.beta.3
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-04 00:00:00 -08:00
+date: 2013-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency