sensu 0.9.4.beta.1 → 0.9.4.beta.2

data/lib/sensu/client.rb

@@ -37,8 +37,8 @@ module Sensu
 
     def setup_amqp
       @logger.debug('[amqp] -- connecting to rabbitmq')
-      rabbitmq = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
-      @amq = AMQP::Channel.new(rabbitmq)
+      @rabbitmq = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
+      @amq = AMQP::Channel.new(@rabbitmq)
     end
 
     def publish_keepalive
@@ -201,9 +201,13 @@ module Sensu
       @timers.each do |timer|
         timer.cancel
       end
-      @logger.warn('[stop] -- unsubscribing from subscriptions')
-      @check_request_queue.unsubscribe do
-        stop_reactor
+      unless @rabbitmq.reconnecting?
+        @logger.warn('[stop] -- unsubscribing from subscriptions')
+        @check_request_queue.unsubscribe do
+          stop_reactor
+        end
+      else
+        EM::stop_event_loop
       end
     end
   end

data/lib/sensu/config.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), 'patches', 'ruby')
-
 require 'rubygems'
 require 'bundler'
 require 'bundler/setup'
@@ -14,6 +12,9 @@ require 'amqp'
 require 'cabin'
 require 'cabin/outputs/em/stdlib-logger'
 
+require File.join(File.dirname(__FILE__), 'patches', 'ruby')
+require File.join(File.dirname(__FILE__), 'patches', 'amqp')
+
 if ENV['RBTRACE']
   require 'rbtrace'
 end

data/lib/sensu/patches/amqp.rb

@@ -0,0 +1,7 @@
+module AMQP
+  module Client
+    def reconnecting?
+      @reconnecting || false
+    end
+  end
+end

data/lib/sensu/server.rb

@@ -48,8 +48,8 @@ module Sensu
 
     def setup_amqp
       @logger.debug('[amqp] -- connecting to rabbitmq')
-      rabbitmq = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
-      @amq = AMQP::Channel.new(rabbitmq)
+      @rabbitmq = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
+      @amq = AMQP::Channel.new(@rabbitmq)
     end
 
     def setup_keepalives
@@ -321,6 +321,18 @@ module Sensu
       end
     end
 
+    def resign_as_master(&block)
+      if @is_master
+        @redis.del('lock:master').callback do
+          @logger.warn('[master] -- resigned as master')
+          block.call if block
+        end
+      else
+        @logger.warn('[master] -- not currently master')
+        block.call if block
+      end
+    end
+
     def setup_master_monitor
       request_master_election
       @timers << EM::PeriodicTimer.new(20) do
@@ -350,18 +362,16 @@ module Sensu
     end
 
     def stop_reactor
-      EM::Timer.new(1) do
-        @logger.info('[stop] -- completing handlers in progress')
-        complete_in_progress = EM::tick_loop do
-          if @handlers_in_progress == 0
-            :stop
-          end
+      @logger.info('[stop] -- completing handlers in progress')
+      complete_in_progress = EM::tick_loop do
+        if @handlers_in_progress == 0
+          :stop
         end
-        complete_in_progress.on_stop do
-          @logger.warn('[stop] -- stopping reactor')
-          EM::PeriodicTimer.new(0.25) do
-            EM::stop_event_loop
-          end
+      end
+      complete_in_progress.on_stop do
+        @logger.warn('[stop] -- stopping reactor')
+        EM::PeriodicTimer.new(0.25) do
+          EM::stop_event_loop
         end
       end
     end
@@ -371,19 +381,20 @@ module Sensu
       @timers.each do |timer|
         timer.cancel
       end
-      @logger.warn('[stop] -- unsubscribing from keepalives')
-      @keepalive_queue.unsubscribe do
-        @logger.warn('[stop] -- unsubscribing from results')
-        @result_queue.unsubscribe do
-          if @is_master
-            @redis.del('lock:master').callback do
-              @logger.warn('[stop] -- resigned as master')
+      unless @rabbitmq.reconnecting?
+        @logger.warn('[stop] -- unsubscribing from keepalives')
+        @keepalive_queue.unsubscribe do
+          @logger.warn('[stop] -- unsubscribing from results')
+          @result_queue.unsubscribe do
+            resign_as_master do
               stop_reactor
             end
-          else
-            stop_reactor
           end
         end
+      else
+        resign_as_master do
+          stop_reactor
+        end
       end
     end
   end

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.4.beta.1"
+  VERSION = "0.9.4.beta.2"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196241
+  hash: 62196247
   prerelease: true
   segments: 
   - 0
   - 9
   - 4
   - beta
-  - 1
-  version: 0.9.4.beta.1
+  - 2
+  version: 0.9.4.beta.2
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-22 00:00:00 -08:00
+date: 2012-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -218,6 +218,7 @@ files:
 - lib/sensu/api.rb
 - lib/sensu/client.rb
 - lib/sensu/config.rb
+- lib/sensu/patches/amqp.rb
 - lib/sensu/patches/redis.rb
 - lib/sensu/patches/ruby.rb
 - lib/sensu/server.rb