sensu 0.17.1-java → 0.17.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef4795a80c565625fc3759a3560666fb4c44757
-  data.tar.gz: 4c34c6daafa600fc4d0c1b3af5a040a1fa4ae637
+  metadata.gz: 522c29de590fd364e34192fd4094e14c2b5b6e9c
+  data.tar.gz: b3288099fa21bb8ecaaa2ee8ce3e2d499b66fda7
 SHA512:
-  metadata.gz: f75462a8c65537eb7ce8b0d923e39abf30aca22a2dbd710b195a464711b663d26aa38241b8531911c4ec0168ba3f7b950f8d6041ef6007533592a833ccb986f1
-  data.tar.gz: cddc959f388ec22776eb63e87f4cf0a2852bad8b9c466fb8e1117561768d2005ba1d7e4229437387a555128ecc49d5ee21d70be20ad4ca059cb8db62e19317c8
+  metadata.gz: 41de9b5dd4f14b50b9dcefe87f2519922852a357465dcf472953dac22ca40c156fa999e93832c69c7092146a919040e3956714e57374b071de49e7969f255977
+  data.tar.gz: 26331f426dfe948a9a2a8b92b8afbf9bf2db305fa1eb21f00259287193264117df0c015762f9a20bfc20cd0dece3e7f506463e03e0003a3edacb415a02d4b197

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.17.2 - 2015-04-08
+
+### Other
+
+Fixed a bug where the Sensu server was unable to stop due to the handling
+event count not being decremented when events were filtered.
+
 ## 0.17.1 - 2015-03-30
 
 ### Features

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.17.1"
+    VERSION = "0.17.2"
 
     # Sensu check severities.
     SEVERITIES = %w[ok warning critical unknown]

data/lib/sensu/server/filter.rb

@@ -285,14 +285,19 @@ module Sensu
       # @param callback [Proc]
       def filter_event(handler, event, &callback)
         details = {:handler => handler, :event => event}
-        if handling_disabled?(event)
-          @logger.info("event handling disabled for event", details)
-        elsif !handle_action?(handler, event)
-          @logger.info("handler does not handle action", details)
-        elsif !handle_severity?(handler, event)
-          @logger.info("handler does not handle event severity", details)
-        elsif handler_subdued?(handler, event)
-          @logger.info("handler is subdued", details)
+        filter_message = case
+        when handling_disabled?(event)
+          "event handling disabled for event"
+        when !handle_action?(handler, event)
+          "handler does not handle action"
+        when !handle_severity?(handler, event)
+          "handler does not handle event severity"
+        when handler_subdued?(handler, event)
+          "handler is subdued"
+        end
+        if filter_message
+          @logger.info(filter_message, details)
+          @handling_event_count -= 1 if @handling_event_count
         else
           event_filtered?(handler, event) do |filtered|
             unless filtered

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
 platform: java
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json