sensu 0.26.3 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e499253359ed5c982a0a29ec1c2b05dd76f6c0
-  data.tar.gz: 5107221e27f4c7bfa7f7233fdefd5bd84b06bd3f
+  metadata.gz: 40d2e4826f92172cff091ca9f9748abb7e0da9ad
+  data.tar.gz: 41c30523f286c24fcf287f220da4daf087bcf421
 SHA512:
-  metadata.gz: 8881c6231598b3c956ae362b3b75eb4851a128a9654338ec5dbbb2b51f2a9ad9200b938cec3f0c2d4992c545c2536dd390c4731e99c872815138e0a46cb775b9
-  data.tar.gz: d0db425cb038e05a9fb255f34f342bae688d4845205d408144533bf63e6c91bbd170c275b950dd2d489010db10148c11e94d4b25991ce845ffda6355b65196b5
+  metadata.gz: c76a81ac584733b7c9b5d4222e219524164c1ee48f717aa2812bc04a5ff3ad54c5d44249e6c9eaa9326ca0020833f55f223f8a504f877e6b44157230d58ee01f
+  data.tar.gz: 217707586fc86d2d3a52f46a5c73bba3f0190f31564f9fb65d6ff364dffab8f22c0ea879b7381c5ac19ecad4b9ac14b136d4bd18aeceaa57fd5ee40c6c39348c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.26.4 - 2016-10-05
+
+### Fixes
+
+Sensu check extension executions are now properly tracked and the Sensu
+client now guards against multiple concurrent executions of the same
+extension.
+
 ## 0.26.3 - 2016-09-21
 
 ### Fixes

data/lib/sensu/client/process.rb

@@ -173,20 +173,30 @@ module Sensu
       # API. If a check definition includes `:extension`, use it's
       # value for the extension name, otherwise use the check name.
       # The check definition is passed to the extension `safe_run()`
-      # method as a parameter, the extension may utilize it.
+      # method as a parameter, the extension may utilize it. This
+      # method guards against multiple executions for the same check
+      # extension.
       #
       # https://github.com/sensu/sensu-extension
       #
       # @param check [Hash]
       def run_check_extension(check)
         @logger.debug("attempting to run check extension", :check => check)
-        check[:executed] = Time.now.to_i
-        extension_name = check[:extension] || check[:name]
-        extension = @extensions[:checks][extension_name]
-        extension.safe_run(check) do |output, status|
-          check[:output] = output
-          check[:status] = status
-          publish_check_result(check)
+        unless @checks_in_progress.include?(check[:name])
+          @checks_in_progress << check[:name]
+          started = Time.now.to_f
+          check[:executed] = started.to_i
+          extension_name = check[:extension] || check[:name]
+          extension = @extensions[:checks][extension_name]
+          extension.safe_run(check) do |output, status|
+            check[:duration] = ("%.3f" % (Time.now.to_f - started)).to_f
+            check[:output] = output
+            check[:status] = status
+            publish_check_result(check)
+            @checks_in_progress.delete(check[:name])
+          end
+        else
+          @logger.warn("previous check extension execution in progress", :check => check)
         end
       end
 

data/lib/sensu/constants.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.26.4
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-22 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A monitoring framework