sensu 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78efe491718e093bc8706ba094ceabfc7afe5147
-  data.tar.gz: 44bcea9d028f5eb956705cdd5eb5198bf5bd322a
+  metadata.gz: 1e3f468041197d7179ce425bcb860e4aaa086ed2
+  data.tar.gz: 6cdf694c5458e4f3f2f6f4fb39f34e5fa6f6e654
 SHA512:
-  metadata.gz: e5732621897ee9fda7044548720ffad14209d1c654e5fd4e7d6ba4cedceaed8cdaa41f79f5e05f8cd6f61b4560fcd687df97659d42116ada86e7dcf1726325eb
-  data.tar.gz: 6d7ce44d97d42ae69820ebfa9fbbd3a3b7dc1da55a6f684da2020dedaca21b1eb53bfe3d956227c925575bcc123b624badbaf75dd6026c503f36826c7a0d1b9b
+  metadata.gz: 95ad9721f784e6e44d8c36f97e1f3119f1753665a3dc9bd9683600f0b241e00d637b41a51ecaf3ebc05aa2fd8c17863868e826a131db0d95b4064814ede3f970
+  data.tar.gz: 359860c37128e467458a0a9f9ffd54261253b0c22e9bc4543b7b03f31602966176f3efcefdd420179871dba99fd0a6c0f611879c97775932919cff8a87fa923c

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