sensu 0.24.0-java → 0.24.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 783c6d643ba21e63db105cedf4deafa5dc7ca741
-  data.tar.gz: d0f89a23866ad270a48520a379ce5a0640a80e26
+  metadata.gz: 433bbf2acb339656f147cd33329ecf58ba53a9f7
+  data.tar.gz: d66d5ec7ba651d64cffd1fc453e2f94c4000fa62
 SHA512:
-  metadata.gz: 19d85e4c78407c4a49186fb7cc248f9f8d01ee1139950f98da104047baeb575436ea10abc8a47a36369d1f57016f843ddc825066ce2ed6deab37a0acb010511a
-  data.tar.gz: 9a6be65ca36e9afd22689551bf69d69a563fba2c4bd95bbee5f551936bfe45cab7a6aa2fd6c3edf7ec4ed96ef554488d5e44b89169d13a86bebcb59656113b93
+  metadata.gz: f643d1332fb5b3404963f1b4cc68106cbcc3617345b03aa93efbec26a1ef293e6f51207d739e4fa5bbcaacb6d9aec164e811bbeeed28a786b502f44181d79400
+  data.tar.gz: f2e68527b873bab0deec29975272ee6d0378d5a79bff709725cdff6f6f7c937b06590ffdb1d171bb56ce6282354679566cd6f928d1518e3658e6a83b70998b12

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.24.1 - 2016-06-07
+
+### Fixes
+
+Fixed a critical bug in Sensu server resume() which caused the server to
+crash when querying the state of the Sensu Transport connection before it
+had been initialized. [#1321](https://github.com/sensu/sensu/pull/1321)
+
+### Other
+
+Updated references to unmatched tokens, i.e. check result output message,
+to better represent the new scope of token substitution.
+[#1322](https://github.com/sensu/sensu/pull/1322)
+
 ## 0.24.0 - 2016-06-06
 
 ### Important

data/lib/sensu/client/process.rb

@@ -153,7 +153,7 @@ module Sensu
               @checks_in_progress.delete(check[:name])
             end
           else
-            check[:output] = "Unmatched command tokens: " + unmatched_tokens.join(", ")
+            check[:output] = "Unmatched client token(s): " + unmatched_tokens.join(", ")
             check[:status] = 3
             check[:handle] = false
             publish_check_result(check)

data/lib/sensu/constants.rb

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

data/lib/sensu/server/process.rb

@@ -1106,15 +1106,24 @@ module Sensu
       # Resume the Sensu server process if it is currently or will
       # soon be paused. The `retry_until_true` helper method is used
       # to determine if the process is paused and if the Redis and
-      # transport connections are connected. If the conditions are
-      # met, `bootstrap()` will be called and true is returned to stop
-      # `retry_until_true`.
+      # transport connections are initiated and connected. If the
+      # conditions are met, `bootstrap()` will be called and true is
+      # returned to stop `retry_until_true`. If the transport has not
+      # yet been initiated, true is is returned, without calling
+      # bootstrap, as we expect bootstrap will be called after the
+      # transport initializes.
       def resume
         retry_until_true(1) do
           if @state == :paused
-            if @redis.connected? && @transport.connected?
-              bootstrap
-              true
+            if @redis.connected?
+              if @transport
+                if @transport.connected?
+                  bootstrap
+                  true
+                end
+              else
+                true
+              end
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: java
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement