sensu 0.5.11 → 0.5.12

data/lib/sensu/client.rb

@@ -8,6 +8,7 @@ module Sensu
         client.setup_amqp
         client.setup_keepalives
         client.setup_subscriptions
+        client.monitor_queues
 
         Signal.trap('INT') do
           EM.stop
@@ -28,14 +29,14 @@ module Sensu
     def setup_amqp
       connection = AMQP.connect(symbolize_keys(@settings['rabbitmq']))
       @amq = MQ.new(connection)
+      @keepalive_queue = @amq.queue('keepalives')
       @result_queue = @amq.queue('results')
     end
 
     def setup_keepalives
-      keepalive_queue = @amq.queue('keepalives')
-      keepalive_queue.publish(@settings['client'].merge({'timestamp' => Time.now.to_i}).to_json)
+      @keepalive_queue.publish(@settings['client'].merge({'timestamp' => Time.now.to_i}).to_json)
       EM.add_periodic_timer(30) do
-        keepalive_queue.publish(@settings['client'].merge({'timestamp' => Time.now.to_i}).to_json)
+        @keepalive_queue.publish(@settings['client'].merge({'timestamp' => Time.now.to_i}).to_json)
       end
     end
 
@@ -70,16 +71,22 @@ module Sensu
     end
 
     def setup_subscriptions
-      uniq_queue = @amq.queue(UUIDTools::UUID.random_create.to_s, :exclusive => true)
+      @uniq_queue = @amq.queue(UUIDTools::UUID.random_create.to_s, :exclusive => true)
       @settings['client']['subscriptions'].each do |exchange|
-        uniq_queue.bind(@amq.fanout(exchange))
+        @uniq_queue.bind(@amq.fanout(exchange))
       end
-      EM.add_periodic_timer(0.5) do
-        unless uniq_queue.subscribed?
-          uniq_queue.subscribe(:ack => true) do |header, check_json|
-            header.ack
-            check = JSON.parse(check_json)
-            execute_check(check)
+      @uniq_queue.subscribe do |check_json|
+        check = JSON.parse(check_json)
+        execute_check(check)
+      end
+    end
+
+    def monitor_queues
+      EM.add_periodic_timer(5) do
+        unless @uniq_queue.subscribed?
+          @uniq_queue.delete
+          EM.add_timer(1) do
+            setup_subscriptions
           end
         end
       end

data/lib/sensu/server.rb

@@ -17,6 +17,7 @@ module Sensu
         server.setup_results
         server.setup_publisher
         server.setup_keepalive_monitor
+        server.monitor_queues
 
         Signal.trap('INT') do
           EM.stop
@@ -48,16 +49,11 @@ module Sensu
     end
 
     def setup_keepalives
-      keepalive_queue = @amq.queue('keepalives')
-      EM.add_periodic_timer(0.5) do
-        unless keepalive_queue.subscribed?
-          keepalive_queue.subscribe(:ack => true) do |header, keepalive_json|
-            header.ack
-            client = JSON.parse(keepalive_json)['name']
-            @redis.set('client:' + client, keepalive_json).callback do
-              @redis.sadd('clients', client)
-            end
-          end
+      @keepalive_queue = @amq.queue('keepalives')
+      @keepalive_queue.subscribe do |keepalive_json|
+        client = JSON.parse(keepalive_json)['name']
+        @redis.set('client:' + client, keepalive_json).callback do
+          @redis.sadd('clients', client)
         end
       end
     end
@@ -132,15 +128,10 @@ module Sensu
     end
 
     def setup_results
-      result_queue = @amq.queue('results')
-      EM.add_periodic_timer(0.5) do
-        unless result_queue.subscribed?
-          result_queue.subscribe(:ack => true) do |header, result_json|
-            header.ack
-            result = JSON.parse(result_json)
-            process_result(result)
-          end
-        end
+      @result_queue = @amq.queue('results')
+      @result_queue.subscribe do |result_json|
+        result = JSON.parse(result_json)
+        process_result(result)
       end
     end
 
@@ -192,5 +183,22 @@ module Sensu
         end
       end
     end
+
+    def monitor_queues
+      EM.add_periodic_timer(5) do
+        unless @keepalive_queue.subscribed?
+          @keepalive_queue.delete
+          EM.add_timer(1) do
+            setup_keepalives
+          end
+        end
+        unless @result_queue.subscribed?
+          @result_queue.delete
+          EM.add_timer(1) do
+            setup_results
+          end
+        end
+      end
+    end
   end
 end

data/sensu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sensu"
-  s.version     = "0.5.11"
+  s.version     = "0.5.12"
   s.authors     = ["Sean Porter", "Justin Kolberg"]
   s.email       = ["sean.porter@sonian.net", "justin.kolberg@sonian.net"]
   s.homepage    = "https://github.com/sonian/sensu"

metadata

@@ -2,7 +2,7 @@
 name: sensu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors: 
 - Sean Porter