sensu 0.28.2 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f8b99b208015d3eb811d1b6e36b3dc7ad274366
-  data.tar.gz: abe2ba00730d4098e7099df837dede11fa167e0f
+  metadata.gz: 9121ba275faec01ad227bfe360ecf35f98bb8136
+  data.tar.gz: a9bd2e508a8f271456775a4061ed9ba4e016880c
 SHA512:
-  metadata.gz: ad07bc1e414a0a0c393efcd7b8c8cffd1a52db803f71266773a2bd2c09492e780fad3eec3fd746496dc06b44ce414c32848ccc3ac37531b54519bb92472b1a4d
-  data.tar.gz: 1280b841dae35dedb0f805effc3a489aae8b71f86260a5157964354889c27a973d925349ca0ae7b6753bac4a79bb194e7b67d2988f45f2b745962cdccb26ce79
+  metadata.gz: f8493131b507781309e4c769d2e3f9273a1bbe97fc6d5bb82d140b44cd4058ea9edf182ec57c955a0156d3a99cc42ddebfc0089c7e2b20813d9505d062b855f8
+  data.tar.gz: a2aa66bc4afe3abcbbe5f378712bd6854784086d5b79865020f85d58a7a652ef4a1c6fe993fe15011eba43e03d8b8af71d90276311aa1043f810b21bfdd1a306

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.28.3 - 2017-03-09
+
+### Fixes
+
+The Sensu client now includes check source when tracking in progress check
+executions. These changes are necessary to allow the Sensu client to
+execute on several concurrent proxy check requests.
+
 ## 0.28.2 - 2017-03-03
 
 ### Fixes

data/lib/sensu/client/process.rb

@@ -100,6 +100,16 @@ module Sensu
         end
       end
 
+      # Create an in progress key for a check, used to determine if an
+      # execution is still in progress. The key is composed of check
+      # `source` (if set) and `name`, joined by a colon.
+      #
+      # @param check [Hash]
+      # @return [String]
+      def check_in_progress_key(check)
+        [check[:source], check[:name]].compact.join(":")
+      end
+
       # Execute a check command, capturing its output (STDOUT/ERR),
       # exit status code, execution duration, timestamp, and publish
       # the result. This method guards against multiple executions for
@@ -115,8 +125,9 @@ module Sensu
       # @param check [Hash]
       def execute_check_command(check)
         @logger.debug("attempting to execute check command", :check => check)
-        unless @checks_in_progress.include?(check[:name])
-          @checks_in_progress << check[:name]
+        in_progress_key = check_in_progress_key(check)
+        unless @checks_in_progress.include?(in_progress_key)
+          @checks_in_progress << in_progress_key
           substituted, unmatched_tokens = object_substitute_tokens(check.dup, @settings[:client])
           check = substituted.merge(:command => check[:command])
           started = Time.now.to_f
@@ -127,14 +138,14 @@ module Sensu
               check[:output] = output
               check[:status] = status
               publish_check_result(check)
-              @checks_in_progress.delete(check[:name])
+              @checks_in_progress.delete(in_progress_key)
             end
           else
             check[:output] = "Unmatched client token(s): " + unmatched_tokens.join(", ")
             check[:status] = 3
             check[:handle] = false
             publish_check_result(check)
-            @checks_in_progress.delete(check[:name])
+            @checks_in_progress.delete(in_progress_key)
           end
         else
           @logger.warn("previous check command execution in progress", :check => check)
@@ -156,8 +167,9 @@ module Sensu
       # @param check [Hash]
       def run_check_extension(check)
         @logger.debug("attempting to run check extension", :check => check)
-        unless @checks_in_progress.include?(check[:name])
-          @checks_in_progress << check[:name]
+        in_progress_key = check_in_progress_key(check)
+        unless @checks_in_progress.include?(in_progress_key)
+          @checks_in_progress << in_progress_key
           started = Time.now.to_f
           check[:executed] = started.to_i
           extension_name = check[:extension] || check[:name]
@@ -167,7 +179,7 @@ module Sensu
             check[:output] = output
             check[:status] = status
             publish_check_result(check)
-            @checks_in_progress.delete(check[:name])
+            @checks_in_progress.delete(in_progress_key)
           end
         else
           @logger.warn("previous check extension execution in progress", :check => check)

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.28.2".freeze
+    VERSION = "0.28.3".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.28.2
+  version: 0.28.3
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -298,7 +298,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