sensu 0.5.4 → 0.5.5

data/lib/sensu/api.rb

@@ -26,7 +26,7 @@ module Sensu
       @settings = config.settings
       set :redis, EM::Hiredis.connect('redis://' + @settings['redis']['host'] + ':' + @settings['redis']['port'].to_s)
       connection = AMQP.connect(symbolize_keys(@settings['rabbitmq']))
-      set :amq, AMQP::Channel.new(connection)
+      set :amq, MQ.new(connection)
     end
 
     helpers do

data/lib/sensu/client.rb

@@ -27,7 +27,7 @@ module Sensu
 
     def setup_amqp
       connection = AMQP.connect(symbolize_keys(@settings['rabbitmq']))
-      @amq = AMQP::Channel.new(connection)
+      @amq = MQ.new(connection)
       @result_queue = @amq.queue('results')
     end
 
@@ -72,7 +72,7 @@ module Sensu
     def setup_subscriptions
       @settings['client']['subscriptions'].each do |exchange|
         uniq_queue_name = UUIDTools::UUID.random_create.to_s
-        @amq.queue(uniq_queue_name, :auto_delete => true).bind(@amq.fanout(exchange)).subscribe do |check_json|
+        @amq.queue(uniq_queue_name, :exclusive => true).bind(@amq.fanout(exchange)).subscribe do |check_json|
           check = JSON.parse(check_json)
           execute_check(check)
         end

data/lib/sensu/server.rb

@@ -45,7 +45,7 @@ module Sensu
 
     def setup_amqp
       connection = AMQP.connect(symbolize_keys(@settings['rabbitmq']))
-      @amq = AMQP::Channel.new(connection)
+      @amq = MQ.new(connection)
     end
 
     def setup_keep_alives
@@ -101,29 +101,20 @@ module Sensu
             check = result['check']
             check.merge!(@settings['checks'][check['name']]) if @settings['checks'].has_key?(check['name'])
             check['handler'] = 'default' unless check['handler']
-            event = {
-              'client' => client,
-              'check' => check
-            }
+            event = {'client' => client, 'check' => check}
             if check['type'] == 'metric'
               handle_event(event)
             else
-              if check['status'] == 0
-                @redis.hexists('events:' + client['name'], check['name']).callback do |exists|
-                  if exists == 1
-                    @redis.hdel('events:' + client['name'], check['name'])
-                    event['action'] = 'resolve'
-                    handle_event(event)
-                  end
-                end
-              else
-                @redis.hget('events:' + client['name'], check['name']).callback do |event_json|
+              @redis.hget('events:' + client['name'], check['name']).callback do |event_json|
+                previous_event = event_json ? JSON.parse(event_json) : nil
+                if previous_event && check['status'] == 0
+                  @redis.hdel('events:' + client['name'], check['name'])
+                  event['action'] = 'resolve'
+                  handle_event(event)
+                else
                   occurrences = 1
-                  unless event_json.nil?
-                    previous_event = JSON.parse(event_json)
-                    if previous_event['status'] == check['status']
-                      occurrences = previous_event['occurrences'] += 1
-                    end
+                  if previous_event && check['status'] == previous_event['status']
+                    occurrences = previous_event['occurrences'] += 1
                   end
                   @redis.hset('events:' + client['name'], check['name'], {'status' => check['status'], 'output' => check['output'], 'occurrences' => occurrences}.to_json).callback do
                     event['occurrences'] = occurrences

data/sensu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sensu"
-  s.version     = "0.5.4"
+  s.version     = "0.5.5"
   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.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Sean Porter