sensu 0.5.5 → 0.5.6

data/lib/sensu/client.rb

@@ -40,10 +40,10 @@ module Sensu
     end
 
     def execute_check(check)
+      result = {'client' => @settings['client']['name'], 'check' => check}
       if @settings['checks'].has_key?(check['name'])
         unless @checks_in_progress.include?(check['name'])
           @checks_in_progress.push(check['name'])
-          result = {'client' => @settings['client']['name'], 'check' => check}
           unmatched_tokens = Array.new
           command = @settings['checks'][check['name']]['command'].gsub(/:::(.*?):::/) do
             key = $1.to_s
@@ -70,12 +70,13 @@ module Sensu
     end
 
     def setup_subscriptions
+      uniq_queue = @amq.queue(UUIDTools::UUID.random_create.to_s, :exclusive => true)
       @settings['client']['subscriptions'].each do |exchange|
-        uniq_queue_name = UUIDTools::UUID.random_create.to_s
-        @amq.queue(uniq_queue_name, :exclusive => true).bind(@amq.fanout(exchange)).subscribe do |check_json|
-          check = JSON.parse(check_json)
-          execute_check(check)
-        end
+        uniq_queue.bind(@amq.fanout(exchange))
+      end
+      uniq_queue.subscribe do |check_json|
+        check = JSON.parse(check_json)
+        execute_check(check)
       end
     end
   end

data/lib/sensu/server.rb

@@ -16,7 +16,6 @@ module Sensu
         server.setup_handlers
         server.setup_results
         server.setup_publisher
-        server.setup_populator
         server.setup_keep_alive_monitor
 
         Signal.trap('INT') do
@@ -129,26 +128,20 @@ module Sensu
       end
     end
 
-    def setup_publisher
+    def setup_publisher(options={})
       exchanges = Hash.new
-      @amq.queue('checks').subscribe do |check_json|
-        check = JSON.parse(check_json)
-        check['subscribers'].each do |exchange|
-          if exchanges[exchange].nil?
-            exchanges[exchange] = @amq.fanout(exchange)
-          end
-          exchanges[exchange].publish({'name' => check['name'], 'issued' => Time.now.to_i}.to_json)
-          EM.debug('published :: ' + exchange + ' :: ' + check['name'])
-        end
-      end
-    end
-
-    def setup_populator
-      check_queue = @amq.queue('checks')
+      stagger = options[:test] ? 0 : 7
       @settings['checks'].each_with_index do |(name, details), index|
-        EM.add_timer(7*index) do
-          EM.add_periodic_timer(details['interval']) do
-            check_queue.publish({'name' => name, 'subscribers' => details['subscribers']}.to_json)
+        EM.add_timer(stagger*index) do
+          details['subscribers'].each do |exchange|
+            if exchanges[exchange].nil?
+              exchanges[exchange] = @amq.fanout(exchange)
+            end
+            interval = options[:test] ? 0.5 : details['interval']
+            EM.add_periodic_timer(interval) do
+              exchanges[exchange].publish({'name' => name, 'issued' => Time.now.to_i}.to_json)
+              EM.debug('published :: ' + exchange + ' :: ' + name)
+            end
           end
         end
       end

data/sensu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sensu"
-  s.version     = "0.5.5"
+  s.version     = "0.5.6"
   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.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Sean Porter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 Z
+date: 2011-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp