sensu 0.9.5.beta → 0.9.5.beta.1

data/lib/sensu.rb

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

data/lib/sensu/api.rb

@@ -38,8 +38,8 @@ module Sensu
       $logger.debug('[setup] -- connecting to redis')
       $redis = Redis.connect($settings.redis.to_hash.symbolize_keys)
       $logger.debug('[setup] -- 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
 
     before do
@@ -51,8 +51,18 @@ module Sensu
       response = {
         :sensu => {
           :version => Sensu::VERSION
+        },
+        :health => {
+          :redis => 'ok',
+          :rabbitmq => 'ok'
         }
       }
+      if $redis.reconnecting?
+        response[:health][:redis] = 'down'
+      end
+      if $rabbitmq.reconnecting?
+        response[:health][:rabbitmq] = 'down'
+      end
       body response.to_json
     end
 

data/lib/sensu/patches/redis.rb

@@ -2,6 +2,7 @@ module Redis
   class Client
     def connection_completed
       @connected = true
+      @reconnecting = false
       @port, @host = Socket.unpack_sockaddr_in(get_peername)
     end
 
@@ -13,6 +14,7 @@ module Redis
     def unbind
       unless !@connected || @closing_connection
         EM::Timer.new(1) do
+          @reconnecting = true
           reconnect(@host, @port)
         end
       else
@@ -24,6 +26,10 @@ module Redis
         end
       end
     end
+
+    def reconnecting?
+      @reconnecting || false
+    end
   end
 
   def self.connect(options={})

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 31098141
+  hash: 62196249
   prerelease: true
   segments: 
   - 0
   - 9
   - 5
   - beta
-  version: 0.9.5.beta
+  - 1
+  version: 0.9.5.beta.1
 platform: ruby
 authors: 
 - Sean Porter