sensu 0.9.12.beta.1 → 0.9.12.beta.2

data/lib/sensu/base.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 
-gem 'oj', '2.0.8'
+gem 'oj', '2.0.9'
 gem 'eventmachine', '1.0.1'
 
 require 'time'

data/lib/sensu/constants.rb

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

data/lib/sensu/server.rb

@@ -465,7 +465,7 @@ module Sensu
                 }
                 if check[:status] != 0 || is_flapping
                   if previous_occurrence && check[:status] == previous_occurrence[:status]
-                    event[:occurrences] = previous_occurrence[:occurrences] += 1
+                    event[:occurrences] = previous_occurrence[:occurrences] + 1
                   end
                   @redis.hset('events:' + client[:name], check[:name], Oj.dump(
                     :output => check[:output],
@@ -594,20 +594,14 @@ module Sensu
             when time_since_last_keepalive >= 180
               check[:output] = 'No keep-alive sent from client in over 180 seconds'
               check[:status] = 2
-              publish_result(client, check)
             when time_since_last_keepalive >= 120
               check[:output] = 'No keep-alive sent from client in over 120 seconds'
               check[:status] = 1
-              publish_result(client, check)
             else
-              @redis.hexists('events:' + client[:name], 'keepalive') do |exists|
-                if exists
-                  check[:output] = 'Keep-alive sent from client'
-                  check[:status] = 0
-                  publish_result(client, check)
-                end
-              end
+              check[:output] = 'Keep-alive sent from client less than 120 seconds ago'
+              check[:status] = 0
             end
+            publish_result(client, check)
           end
         end
       end

data/sensu.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.has_rdoc    = false
 
-  s.add_dependency('oj', '2.0.8')
+  s.add_dependency('oj', '2.0.9')
   s.add_dependency('eventmachine', '1.0.1')
   s.add_dependency('amqp', '0.9.9')
   s.add_dependency('em-redis-unified', '0.4.1')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: -3305052632
+  hash: -3791266186
   prerelease: true
   segments: 
   - 0
   - 9
   - 12
   - beta
-  - 1
-  version: 0.9.12.beta.1
+  - 2
+  version: 0.9.12.beta.2
 platform: ruby
 authors: 
 - Sean Porter
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 2
         - 0
-        - 8
-        version: 2.0.8
+        - 9
+        version: 2.0.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency