sensu 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59189ea63a91ecc77669ef407887f2a91be61476
-  data.tar.gz: 3e38ff971911571134ebfca7dc32e1d4ec187434
+  metadata.gz: 0a0fac0647fef9c4dad920c91d477e0aac3ccefe
+  data.tar.gz: f0ba6869b8a2e76e9c9a673332a87af8f9b30262
 SHA512:
-  metadata.gz: 91480595d18e1b80e38acf40edbabd2aa7fe8ffe9f6493a12f7e56963e1ca60bac9ef88011bcd01f3795ee0cce3ba7a12fc974838ab87bd88c975977381261f3
-  data.tar.gz: 37f8686e67f7ca4c694c775bdd2f59d05da38520f66de9aaaf8ddf8476198d70de8c354b4596fcafd7a28ac4ea7f7defb94186c6a85f849dfbc7f2b678563264
+  metadata.gz: 10ccf9155bbda665fe9c8b590cb93bc413e1825324069d00187d58466dd9a86ad0a6d99608796aabeaa39b3c1daac6b49e3d6612c7b4bf875c1a88c5e61d5186
+  data.tar.gz: 8ece96457154d1d64fab3516afc527c5690397e84ad2d3c412ae25c1c7b1c467eba9f374da2cde8c4daa9bef1625bdc17ac7ad6b99beb469d6504b7a6db31170

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: ruby
 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