sensu 0.12.0 → 0.12.1

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.12.1 - 2013-11-02
+
+### Features
+
+API GET `/stashes` now returns stash expiration information, time
+remaining in seconds. eg. [{"path": "foo", "content":{"bar": "baz"},
+"expire": 3598}].
+
+### Other
+
+Fixed a config loading bug where Sensu was not ignoring files without a
+valid JSON object.
+
+Fixed `handling event` log line data for extensions.
+
 ## 0.12.0 - 2013-10-28
 
 ### Non-backwards compatible changes

data/lib/sensu/api.rb

@@ -642,17 +642,20 @@ module Sensu
         unless stashes.empty?
           stashes.each_with_index do |path, index|
             $redis.get('stash:' + path) do |stash_json|
-              unless stash_json.nil?
-                item = {
-                  :path => path,
-                  :content => Oj.load(stash_json)
-                }
-                response << item
-              else
-                $redis.srem('stashes', path)
-              end
-              if index == stashes.size - 1
-                body Oj.dump(pagination(response))
+              $redis.ttl('stash:' + path) do |ttl|
+                unless stash_json.nil?
+                  item = {
+                    :path => path,
+                    :content => Oj.load(stash_json),
+                    :expire => ttl
+                  }
+                  response << item
+                else
+                  $redis.srem('stashes', path)
+                end
+                if index == stashes.size - 1
+                  body Oj.dump(pagination(response))
+                end
               end
             end
           end

data/lib/sensu/constants.rb

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

data/lib/sensu/server.rb

@@ -283,7 +283,7 @@ module Sensu
         log_level = event[:check][:type] == 'metric' ? :debug : :info
         @logger.send(log_level, 'handling event', {
           :event => event,
-          :handler => handler
+          :handler => handler.respond_to?(:definition) ? handler.definition : handler
         })
         @handlers_in_progress_count += 1
         on_error = Proc.new do |error|

data/lib/sensu/settings.rb

@@ -84,7 +84,7 @@ module Sensu
       if File.file?(file) && File.readable?(file)
         begin
           contents = File.open(file, 'r').read
-          config = Oj.load(contents)
+          config = Oj.load(contents, :mode => :strict)
           merged = deep_merge(@settings, config)
           unless @loaded_files.empty?
             changes = deep_diff(@settings, merged)

metadata

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