sensu 0.9.6.beta.2 → 0.9.6.beta.3

data/lib/sensu/api.rb

@@ -58,18 +58,23 @@ module Sensu
 
     configure do
       disable :protection
+      disable :show_exceptions
     end
 
     not_found do
       ''
     end
 
+    error do
+      ''
+    end
+
     before do
       content_type 'application/json'
+      request_log(env)
     end
 
     aget '/info' do
-      request_log(env)
       response = {
         :sensu => {
           :version => VERSION
@@ -89,7 +94,6 @@ module Sensu
     end
 
     aget '/clients' do
-      request_log(env)
       response = Array.new
       $redis.smembers('clients').callback do |clients|
         unless clients.empty?
@@ -108,7 +112,6 @@ module Sensu
     end
 
     aget '/client/:name' do |client_name|
-      request_log(env)
       $redis.get('client:' + client_name).callback do |client_json|
         unless client_json.nil?
           body client_json
@@ -120,7 +123,6 @@ module Sensu
     end
 
     adelete '/client/:name' do |client_name|
-      request_log(env)
       $redis.get('client:' + client_name).callback do |client_json|
         unless client_json.nil?
           client = JSON.parse(client_json, :symbolize_names => true)
@@ -148,8 +150,11 @@ module Sensu
               $redis.srem('clients', client_name)
               $redis.del('events:' + client_name)
               $redis.del('client:' + client_name)
-              $settings[:checks].each_key do |check_name|
-                $redis.del('history:' + client_name + ':' + check_name)
+              $redis.smembers('history:' + client_name).callback do |checks|
+                checks.each do |check_name|
+                  $redis.del('history:' + client_name + ':' + check_name)
+                end
+                $redis.del('history:' + client_name)
               end
             end
             status 204
@@ -163,12 +168,10 @@ module Sensu
     end
 
     aget '/checks' do
-      request_log(env)
       body $settings.checks.to_json
     end
 
     aget '/check/:name' do |check_name|
-      request_log(env)
       if $settings.check_exists?(check_name)
         response = $settings[:checks][check_name].merge(:name => check_name)
         body response.to_json
@@ -179,14 +182,13 @@ module Sensu
     end
 
     apost '/check/request' do
-      request_log(env)
       begin
         post_body = JSON.parse(request.body.read, :symbolize_names => true)
       rescue JSON::ParserError
         status 400
         body ''
       end
-      if post_body[:check].is_a?(String) && post_body[:subscribers].is_a?(Array)
+      if post_body.is_a?(Hash) && post_body[:check].is_a?(String) && post_body[:subscribers].is_a?(Array)
         payload = {
           :name => post_body[:check],
           :issued => Time.now.to_i
@@ -206,7 +208,6 @@ module Sensu
     end
 
     aget '/events' do
-      request_log(env)
       response = Array.new
       $redis.smembers('clients').callback do |clients|
         unless clients.empty?
@@ -227,7 +228,6 @@ module Sensu
     end
 
     aget '/event/:client/:check' do |client_name, check_name|
-      request_log(env)
       $redis.hgetall('events:' + client_name).callback do |events|
         event_json = events[check_name]
         unless event_json.nil?
@@ -241,14 +241,13 @@ module Sensu
     end
 
     apost '/event/resolve' do
-      request_log(env)
       begin
         post_body = JSON.parse(request.body.read, :symbolize_names => true)
       rescue JSON::ParserError
         status 400
         body ''
       end
-      if post_body[:client].is_a?(String) && post_body[:check].is_a?(String)
+      if post_body.is_a?(Hash) && post_body[:client].is_a?(String) && post_body[:check].is_a?(String)
         $redis.hgetall('events:' + post_body[:client]).callback do |events|
           if events.include?(post_body[:check])
             payload = {
@@ -278,7 +277,6 @@ module Sensu
     end
 
     apost '/stash/*' do |path|
-      request_log(env)
       begin
         post_body = JSON.parse(request.body.read)
       rescue JSON::ParserError
@@ -294,7 +292,6 @@ module Sensu
     end
 
     aget '/stash/*' do |path|
-      request_log(env)
       $redis.get('stash:' + path).callback do |stash_json|
         if stash_json.nil?
           status 404
@@ -306,7 +303,6 @@ module Sensu
     end
 
     adelete '/stash/*' do |path|
-      request_log(env)
       $redis.exists('stash:' + path).callback do |stash_exists|
         if stash_exists
           $redis.srem('stashes', path).callback do
@@ -323,14 +319,12 @@ module Sensu
     end
 
     aget '/stashes' do
-      request_log(env)
       $redis.smembers('stashes') do |stashes|
         body stashes.to_json
       end
     end
 
     apost '/stashes' do
-      request_log(env)
       begin
         post_body = JSON.parse(request.body.read)
       rescue JSON::ParserError

data/lib/sensu/constants.rb

@@ -1,5 +1,5 @@
 module Sensu
-  VERSION = '0.9.6.beta.2'
+  VERSION = '0.9.6.beta.3'
 
   DEFAULT_OPTIONS = {
     :config_file => '/etc/sensu/config.json',

data/lib/sensu/server.rb

@@ -182,6 +182,7 @@ module Sensu
             :check => check,
             :occurrences => 1
           }
+          @redis.sadd('history:' + client[:name], check[:name])
           history_key = 'history:' + client[:name] + ':' + check[:name]
           @redis.rpush(history_key, check[:status]).callback do
             @redis.lrange(history_key, -21, -1).callback do |history|

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196231
+  hash: 62196229
   prerelease: true
   segments: 
   - 0
   - 9
   - 6
   - beta
-  - 2
-  version: 0.9.6.beta.2
+  - 3
+  version: 0.9.6.beta.3
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-03 00:00:00 -07:00
+date: 2012-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency