sensu 0.9.8.beta.2 → 0.9.8.beta.3

data/CHANGELOG.md

@@ -14,6 +14,8 @@ Fixed flap detection.
 
 Gracefully handle possible failed RabbitMQ authentication.
 
+Catch and log AMQP channel errors, which cause the channel to close.
+
 ## 0.9.7 - 2012-09-20
 
 ### Features

data/lib/sensu/api.rb

@@ -311,20 +311,29 @@ module Sensu
       begin
         post_body = JSON.parse(request.body.read, :symbolize_names => true)
         check_name = post_body[:check]
-        subscribers = post_body[:subscribers]
+        subscribers = post_body[:subscribers] || Array.new
         if check_name.is_a?(String) && subscribers.is_a?(Array)
-          payload = {
-            :name => check_name,
-            :issued => Time.now.to_i
-          }
-          $logger.info('publishing check request', {
-            :payload => payload,
-            :subscribers => subscribers
-          })
-          subscribers.uniq.each do |exchange_name|
-            $amq.fanout(exchange_name).publish(payload.to_json)
+          if $settings.check_exists?(check_name)
+            check = $settings[:checks][check_name]
+            if subscribers.empty?
+              subscribers = check[:subscribers] || Array.new
+            end
+            payload = {
+              :name => check_name,
+              :command => check[:command],
+              :issued => Time.now.to_i
+            }
+            $logger.info('publishing check request', {
+              :payload => payload,
+              :subscribers => subscribers
+            })
+            subscribers.uniq.each do |exchange_name|
+              $amq.fanout(exchange_name).publish(payload.to_json)
+            end
+            created!
+          else
+            not_found!
           end
-          created!
         else
           bad_request!
         end

data/lib/sensu/constants.rb

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

data/lib/sensu/server.rb

@@ -76,6 +76,15 @@ module Sensu
       end
       @amq = AMQP::Channel.new(@rabbitmq)
       @amq.auto_recovery = true
+      @amq.on_error do |channel, channel_close|
+        @logger.fatal('rabbitmq channel closed', {
+          :error => {
+            :reply_code => channel_close.reply_code,
+            :reply_text => channel_close.reply_text
+          }
+        })
+        stop
+      end
     end
 
     def setup_keepalives

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.9.8.beta.2
+  version: 0.9.8.beta.3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &9708760 !ruby/object:Gem::Requirement
+  requirement: &19119920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9708760
+  version_requirements: *19119920
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &9707060 !ruby/object:Gem::Requirement
+  requirement: &19040560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *9707060
+  version_requirements: *19040560
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9706020 !ruby/object:Gem::Requirement
+  requirement: &19037500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9706020
+  version_requirements: *19037500
 - !ruby/object:Gem::Dependency
   name: cabin
-  requirement: &9703280 !ruby/object:Gem::Requirement
+  requirement: &18662780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *9703280
+  version_requirements: *18662780
 - !ruby/object:Gem::Dependency
   name: ruby-redis
-  requirement: &9700500 !ruby/object:Gem::Requirement
+  requirement: &18661760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *9700500
+  version_requirements: *18661760
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &9698660 !ruby/object:Gem::Requirement
+  requirement: &18660860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *9698660
+  version_requirements: *18660860
 - !ruby/object:Gem::Dependency
   name: async_sinatra
-  requirement: &9697480 !ruby/object:Gem::Requirement
+  requirement: &18658720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9697480
+  version_requirements: *18658720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9696760 !ruby/object:Gem::Requirement
+  requirement: &18657720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9696760
+  version_requirements: *18657720
 - !ruby/object:Gem::Dependency
   name: em-spec
-  requirement: &9696120 !ruby/object:Gem::Requirement
+  requirement: &18656940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9696120
+  version_requirements: *18656940
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &9695580 !ruby/object:Gem::Requirement
+  requirement: &18656480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9695580
+  version_requirements: *18656480
 description: A monitoring framework that aims to be simple, malleable, and scalable.
   Uses the publish/subscribe model.
 email: