sensu 0.9.6.beta.5 → 0.9.6.beta.6

data/lib/sensu/api.rb

@@ -32,13 +32,29 @@ module Sensu
       })
       $redis = Sensu::Redis.connect($settings[:redis])
       $redis.on_disconnect = Proc.new do
-        $logger.warn('reconnecting to redis')
-        $redis.reconnect!
+        if $redis.connection_established?
+          $logger.warn('reconnecting to redis')
+          $redis.reconnect!
+        else
+          $logger.fatal('cannot connect to redis', {
+            :settings => $settings[:redis]
+          })
+          $logger.fatal('SENSU NOT RUNNING!')
+          exit 2
+        end
       end
       $logger.debug('connecting to rabbitmq', {
         :settings => $settings[:rabbitmq]
       })
       $rabbitmq = AMQP.connect($settings[:rabbitmq])
+      $rabbitmq.on_disconnect = Proc.new do
+        $logger.fatal('cannot connect to rabbitmq', {
+          :settings => $settings[:rabbitmq]
+        })
+        $logger.fatal('SENSU NOT RUNNING!')
+        $redis.close
+        exit 2
+      end
       $amq = AMQP::Channel.new($rabbitmq)
       if $settings[:api][:user] && $settings[:api][:password]
         use Rack::Auth::Basic do |user, password|

data/lib/sensu/base.rb

@@ -10,6 +10,7 @@ require 'cabin'
 require 'amqp'
 
 require File.join(File.dirname(__FILE__), 'patches', 'ruby')
+require File.join(File.dirname(__FILE__), 'patches', 'amqp')
 
 require File.join(File.dirname(__FILE__), 'constants')
 require File.join(File.dirname(__FILE__), 'cli')

data/lib/sensu/client.rb

@@ -34,6 +34,13 @@ module Sensu
         :settings => @settings[:rabbitmq]
       })
       @rabbitmq = AMQP.connect(@settings[:rabbitmq])
+      @rabbitmq.on_disconnect = Proc.new do
+        @logger.fatal('cannot connect to rabbitmq', {
+          :settings => @settings[:rabbitmq]
+        })
+        @logger.fatal('SENSU NOT RUNNING!')
+        exit 2
+      end
       @amq = AMQP::Channel.new(@rabbitmq)
     end
 

data/lib/sensu/constants.rb

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

data/lib/sensu/patches/amqp.rb

@@ -0,0 +1,5 @@
+module AMQP
+  module Client
+    attr_accessor :on_disconnect
+  end
+end

data/lib/sensu/redis.rb

@@ -4,14 +4,16 @@ module Sensu
   class Redis < Redis::Client
     attr_accessor :host, :port, :password, :on_disconnect
 
-    def initialize(*args)
+    def initialize(*arguments)
       super
       @logger = Cabin::Channel.get
+      @connection_established = false
       @connected = false
       @closing_connection = false
     end
 
     def connection_completed
+      @connection_established = true
       @connected = true
       if @password
         auth(@password).callback do |reply|
@@ -49,6 +51,10 @@ module Sensu
       end
     end
 
+    def connection_established?
+      @connection_established
+    end
+
     def connected?
       @connected
     end

data/lib/sensu/server.rb

@@ -38,8 +38,16 @@ module Sensu
       @redis = Sensu::Redis.connect(@settings[:redis])
       unless testing?
         @redis.on_disconnect = Proc.new do
-          @logger.fatal('redis connection closed')
-          stop('TERM')
+          if @redis.connection_established?
+            @logger.fatal('redis connection closed')
+            stop('TERM')
+          else
+            @logger.fatal('cannot connect to redis', {
+              :settings => @settings[:redis]
+            })
+            @logger.fatal('SENSU NOT RUNNING!')
+            exit 2
+          end
         end
       end
     end
@@ -49,6 +57,14 @@ module Sensu
         :settings => @settings[:rabbitmq]
       })
       @rabbitmq = AMQP.connect(@settings[:rabbitmq])
+      @rabbitmq.on_disconnect = Proc.new do
+        @logger.fatal('cannot connect to rabbitmq', {
+          :settings => @settings[:rabbitmq]
+        })
+        @logger.fatal('SENSU NOT RUNNING!')
+        @redis.close
+        exit 2
+      end
       @amq = AMQP::Channel.new(@rabbitmq)
     end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196233
+  hash: 62196239
   prerelease: true
   segments: 
   - 0
   - 9
   - 6
   - beta
-  - 5
-  version: 0.9.6.beta.5
+  - 6
+  version: 0.9.6.beta.6
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-25 00:00:00 -07:00
+date: 2012-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -193,6 +193,7 @@ files:
 - lib/sensu/client.rb
 - lib/sensu/constants.rb
 - lib/sensu/logger.rb
+- lib/sensu/patches/amqp.rb
 - lib/sensu/patches/ruby.rb
 - lib/sensu/process.rb
 - lib/sensu/redis.rb