sensu 0.12.1 → 0.12.2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.12.2 - 2013-11-22
+
+### Other
+
+API routes now have an optional trailing slash.
+
+RabbitMQ initial connection timeout increased from 10 to 20 seconds.
+
+RabbitMQ connection closed errors are now rescued when attempting to
+publish to an exchange, while Sensu is reconnecting.
+
 ## 0.12.1 - 2013-11-02
 
 ### Features

data/lib/sensu/api.rb

@@ -253,7 +253,14 @@ module Sensu
         $logger.info('publishing check result', {
           :payload => payload
         })
-        $amq.direct('results').publish(Oj.dump(payload))
+        begin
+          $amq.direct('results').publish(Oj.dump(payload))
+        rescue AMQ::Client::ConnectionClosedError => error
+          $logger.error('failed to publish check result', {
+            :payload => payload,
+            :error => error.to_s
+          })
+        end
       end
     end
 
@@ -262,7 +269,7 @@ module Sensu
       content_type 'application/json'
     end
 
-    aget '/info' do
+    aget '/info/?' do
       rabbitmq_info do |info|
         response = {
           :sensu => {
@@ -277,7 +284,7 @@ module Sensu
       end
     end
 
-    aget '/health' do
+    aget '/health/?' do
       if $redis.connected? && $rabbitmq.connected?
         healthy = Array.new
         min_consumers = integer_parameter(params[:consumers])
@@ -298,7 +305,7 @@ module Sensu
       end
     end
 
-    aget '/clients' do
+    aget '/clients/?' do
       response = Array.new
       $redis.smembers('clients') do |clients|
         clients = pagination(clients)
@@ -317,7 +324,7 @@ module Sensu
       end
     end
 
-    aget %r{/clients?/([\w\.-]+)$} do |client_name|
+    aget %r{/clients?/([\w\.-]+)/?$} do |client_name|
       $redis.get('client:' + client_name) do |client_json|
         unless client_json.nil?
           body client_json
@@ -327,7 +334,7 @@ module Sensu
       end
     end
 
-    aget %r{/clients/([\w\.-]+)/history$} do |client_name|
+    aget %r{/clients/([\w\.-]+)/history/?$} do |client_name|
       response = Array.new
       $redis.smembers('history:' + client_name) do |checks|
         unless checks.empty?
@@ -360,7 +367,7 @@ module Sensu
       end
     end
 
-    adelete %r{/clients?/([\w\.-]+)$} do |client_name|
+    adelete %r{/clients?/([\w\.-]+)/?$} do |client_name|
       $redis.get('client:' + client_name) do |client_json|
         unless client_json.nil?
           $redis.hgetall('events:' + client_name) do |events|
@@ -392,11 +399,11 @@ module Sensu
       end
     end
 
-    aget '/checks' do
+    aget '/checks/?' do
       body Oj.dump($settings.checks)
     end
 
-    aget %r{/checks?/([\w\.-]+)$} do |check_name|
+    aget %r{/checks?/([\w\.-]+)/?$} do |check_name|
       if $settings.check_exists?(check_name)
         response = $settings[:checks][check_name].merge(:name => check_name)
         body Oj.dump(response)
@@ -405,7 +412,7 @@ module Sensu
       end
     end
 
-    apost '/request' do
+    apost '/request/?' do
       rules = {
         :check => {:type => String, :nil_ok => false},
         :subscribers => {:type => Array, :nil_ok => true}
@@ -424,7 +431,15 @@ module Sensu
             :subscribers => subscribers
           })
           subscribers.uniq.each do |exchange_name|
-            $amq.fanout(exchange_name).publish(Oj.dump(payload))
+            begin
+              $amq.fanout(exchange_name).publish(Oj.dump(payload))
+            rescue AMQ::Client::ConnectionClosedError => error
+              $logger.error('failed to publish check request', {
+                :exchange_name => exchange_name,
+                :payload => payload,
+                :error => error.to_s
+              })
+            end
           end
           issued!
         else
@@ -433,7 +448,7 @@ module Sensu
       end
     end
 
-    aget '/events' do
+    aget '/events/?' do
       response = Array.new
       $redis.smembers('clients') do |clients|
         unless clients.empty?
@@ -453,7 +468,7 @@ module Sensu
       end
     end
 
-    aget %r{/events/([\w\.-]+)$} do |client_name|
+    aget %r{/events/([\w\.-]+)/?$} do |client_name|
       response = Array.new
       $redis.hgetall('events:' + client_name) do |events|
         events.each do |check_name, event_json|
@@ -463,7 +478,7 @@ module Sensu
       end
     end
 
-    aget %r{/events?/([\w\.-]+)/([\w\.-]+)$} do |client_name, check_name|
+    aget %r{/events?/([\w\.-]+)/([\w\.-]+)/?$} do |client_name, check_name|
       $redis.hgetall('events:' + client_name) do |events|
         event_json = events[check_name]
         unless event_json.nil?
@@ -474,7 +489,7 @@ module Sensu
       end
     end
 
-    adelete %r{/events?/([\w\.-]+)/([\w\.-]+)$} do |client_name, check_name|
+    adelete %r{/events?/([\w\.-]+)/([\w\.-]+)/?$} do |client_name, check_name|
       $redis.hgetall('events:' + client_name) do |events|
         if events.include?(check_name)
           resolve_event(event_hash(events[check_name], client_name, check_name))
@@ -485,7 +500,7 @@ module Sensu
       end
     end
 
-    apost '/resolve' do
+    apost '/resolve/?' do
       rules = {
         :client => {:type => String, :nil_ok => false},
         :check => {:type => String, :nil_ok => false}
@@ -502,7 +517,7 @@ module Sensu
       end
     end
 
-    aget '/aggregates' do
+    aget '/aggregates/?' do
       response = Array.new
       $redis.smembers('aggregates') do |checks|
         unless checks.empty?
@@ -528,7 +543,7 @@ module Sensu
       end
     end
 
-    aget %r{/aggregates/([\w\.-]+)$} do |check_name|
+    aget %r{/aggregates/([\w\.-]+)/?$} do |check_name|
       $redis.smembers('aggregates:' + check_name) do |aggregates|
         unless aggregates.empty?
           aggregates.reverse!
@@ -549,7 +564,7 @@ module Sensu
       end
     end
 
-    adelete %r{/aggregates/([\w\.-]+)$} do |check_name|
+    adelete %r{/aggregates/([\w\.-]+)/?$} do |check_name|
       $redis.smembers('aggregates:' + check_name) do |aggregates|
         unless aggregates.empty?
           aggregates.each do |check_issued|
@@ -568,7 +583,7 @@ module Sensu
       end
     end
 
-    aget %r{/aggregates?/([\w\.-]+)/([\w\.-]+)$} do |check_name, check_issued|
+    aget %r{/aggregates?/([\w\.-]+)/([\w\.-]+)/?$} do |check_name, check_issued|
       result_set = check_name + ':' + check_issued
       $redis.hgetall('aggregate:' + result_set) do |aggregate|
         unless aggregate.empty?
@@ -602,7 +617,7 @@ module Sensu
       end
     end
 
-    apost %r{/stash(?:es)?/(.*)} do |path|
+    apost %r{/stash(?:es)?/(.*)/?} do |path|
       read_data do |data|
         $redis.set('stash:' + path, Oj.dump(data)) do
           $redis.sadd('stashes', path) do
@@ -612,7 +627,7 @@ module Sensu
       end
     end
 
-    aget %r{/stash(?:es)?/(.*)} do |path|
+    aget %r{/stash(?:es)?/(.*)/?} do |path|
       $redis.get('stash:' + path) do |stash_json|
         unless stash_json.nil?
           body stash_json
@@ -622,7 +637,7 @@ module Sensu
       end
     end
 
-    adelete %r{/stash(?:es)?/(.*)} do |path|
+    adelete %r{/stash(?:es)?/(.*)/?} do |path|
       $redis.exists('stash:' + path) do |stash_exists|
         if stash_exists
           $redis.srem('stashes', path) do
@@ -636,7 +651,7 @@ module Sensu
       end
     end
 
-    aget '/stashes' do
+    aget '/stashes/?' do
       response = Array.new
       $redis.smembers('stashes') do |stashes|
         unless stashes.empty?
@@ -665,7 +680,7 @@ module Sensu
       end
     end
 
-    apost '/stashes' do
+    apost '/stashes/?' do
       rules = {
         :path => {:type => String, :nil_ok => false},
         :content => {:type => Hash, :nil_ok => false},

data/lib/sensu/client.rb

@@ -53,7 +53,14 @@ module Sensu
       @logger.debug('publishing keepalive', {
         :payload => payload
       })
-      @amq.direct('keepalives').publish(Oj.dump(payload))
+      begin
+        @amq.direct('keepalives').publish(Oj.dump(payload))
+      rescue AMQ::Client::ConnectionClosedError => error
+        @logger.error('failed to publish keepalive', {
+          :payload => payload,
+          :error => error.to_s
+        })
+      end
     end
 
     def setup_keepalives
@@ -74,7 +81,14 @@ module Sensu
       @logger.info('publishing check result', {
         :payload => payload
       })
-      @amq.direct('results').publish(Oj.dump(payload))
+      begin
+        @amq.direct('results').publish(Oj.dump(payload))
+      rescue AMQ::Client::ConnectionClosedError => error
+        @logger.error('failed to publish check result', {
+          :payload => payload,
+          :error => error.to_s
+        })
+      end
     end
 
     def substitute_command_tokens(check)

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.12.1'
+    VERSION = '0.12.2'
 
     LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
 

data/lib/sensu/rabbitmq.rb

@@ -47,7 +47,7 @@ module Sensu
     end
 
     def connect(options={})
-      timeout = EM::Timer.new(10) do
+      timeout = EM::Timer.new(20) do
         error = RabbitMQError.new('timed out while attempting to connect')
         @on_error.call(error)
       end

data/lib/sensu/server.rb

@@ -339,7 +339,15 @@ module Sensu
               [:name, :type].include?(key)
             end
             unless event_data.empty?
-              @amq.method(exchange_type).call(exchange_name, exchange_options).publish(event_data)
+              begin
+                @amq.method(exchange_type).call(exchange_name, exchange_options).publish(event_data)
+              rescue AMQ::Client::ConnectionClosedError => error
+                @logger.error('failed to publish event data to an exchange', {
+                  :exchange => handler[:exchange],
+                  :payload => event_data,
+                  :error => error.to_s
+                })
+              end
             end
             @handlers_in_progress_count -= 1
           when 'extension'
@@ -514,7 +522,15 @@ module Sensu
         :subscribers => check[:subscribers]
       })
       check[:subscribers].each do |exchange_name|
-        @amq.fanout(exchange_name).publish(Oj.dump(payload))
+        begin
+          @amq.fanout(exchange_name).publish(Oj.dump(payload))
+        rescue AMQ::Client::ConnectionClosedError => error
+          @logger.error('failed to publish check request', {
+            :exchange_name => exchange_name,
+            :payload => payload,
+            :error => error.to_s
+          })
+        end
       end
     end
 
@@ -558,7 +574,14 @@ module Sensu
       @logger.debug('publishing check result', {
         :payload => payload
       })
-      @amq.direct('results').publish(Oj.dump(payload))
+      begin
+        @amq.direct('results').publish(Oj.dump(payload))
+      rescue AMQ::Client::ConnectionClosedError => error
+        @logger.error('failed to publish check result', {
+          :payload => payload,
+          :error => error.to_s
+        })
+      end
     end
 
     def determine_stale_clients

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 12
-  - 1
-  version: 0.12.1
+  - 2
+  version: 0.12.2
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-02 00:00:00 -07:00
+date: 2013-11-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency