sensu 0.25.3 → 0.25.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb6d18da6177df8e89c857130ca0ed9bcc6fbd84
-  data.tar.gz: f14ab5690a7491100a070f4a21b705da0d05f69c
+  metadata.gz: 395c016d81d285d4638a986ed2e74f3a57eeee12
+  data.tar.gz: b1910e9c168985868d21960ece8dc89db4827814
 SHA512:
-  metadata.gz: dd9083aff0b54daa2253cf3f4f9caa8a56702d45070c7fbaa6f966cc547d77f76d8b8c0410d1a8423d794cd814c571e2f1e36e6d95569c6912cc9eef8d69dc15
-  data.tar.gz: b59e0aad3001b9432fc121735450e93ffe6587ad92988573f54b76ba14a153ea5667f7e2e794766c7fecc08166b8d3669f4c8c2884df3cd2966b09007ec06900
+  metadata.gz: d019339a148fb8ddc6f5bed53c39229ef5b2007ce80f8e20c63fcd26ca246180cd52fbcefe19dc1b8526fce5284ef80d79b5e5caede41af04e4d161eece9daab
+  data.tar.gz: f33ded0aae861eedefcb2260a2d0c8fca7356511db8f101ddb4d038099ddbb929b8537e703a1be9d460abf2bb6234ce552c7ef6ad4929a7f7777da842239ff07

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.25.4 - 2016-06-20
+
+### Fixes
+
+Fixed a race condition bug in the Sensu API where the `@redis` and
+`@transport` objects were not initialized before serving API requests.
+
 ## 0.25.3 - 2016-06-17
 
 ### Fixes

data/lib/sensu/#test.json#

@@ -0,0 +1,37 @@
+{
+
+    "checks": {
+
+        "check_procs_slapd": {
+
+            "command": "/usr/local/nagios/libexec/check_procs -c 1:4 -w 1:4 -a libexec/slapd",
+
+            "subscribers": ["EBB_CKPRC_SLAPD", "EBB"],
+
+            "interval": 60
+
+        },
+
+        "check_procs_syslog-ng": {
+
+            "command": "/usr/local/nagios/libexec/check_procs -w 1:4 -c 1:4 -a syslog-ng",
+
+            "subscribers": ["EBB_CKPRC_SYSLOGNG", "EBB"],
+
+            "interval": 60
+
+        },
+
+        "check_procs_total_procs": {
+
+            "command": "/usr/local/nagios/libexec/check_procs -w 150 -c 250",
+
+            "subscribers": ["EBB_CKPRC_TOTAL", "EBB"],
+
+            "interval": 60
+
+        }
+
+    }
+
+}

data/lib/sensu/api/process.rb

@@ -15,13 +15,23 @@ module Sensu
       def self.run(options={})
         api = self.new(options)
         EM::run do
-          api.setup_redis
-          api.setup_transport
           api.start
           api.setup_signal_traps
         end
       end
 
+      # Setup connections to redis and transport
+      #
+      # @yield [Object] a callback/block to be called after redis and
+      #   transport connections have been established.
+      def setup_connections
+        setup_redis do |redis|
+          setup_transport do |transport|
+            yield if block_given?
+          end
+        end
+      end
+
       # Start the API HTTP server. This method sets `@http_server`.
       #
       # @param bind [String] address to listen on.
@@ -46,7 +56,10 @@ module Sensu
         api = @settings[:api] || {}
         bind = api[:bind] || "0.0.0.0"
         port = api[:port] || 4567
-        start_http_server(bind, port)
+        setup_connections do
+          start_http_server(bind, port)
+          yield if block_given?
+        end
         super
       end
 
@@ -67,11 +80,8 @@ module Sensu
       # @param options [Hash]
       def self.test(options={})
         api = self.new(options)
-        api.setup_redis do
-          api.setup_transport do
-            api.start
-            yield
-          end
+        api.start do
+          yield
         end
       end
     end

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.25.3".freeze
+    VERSION = "0.25.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.25.3
+  version: 0.25.4
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -227,6 +227,7 @@ files:
 - exe/sensu-install
 - exe/sensu-server
 - lib/sensu.rb
+- lib/sensu/#test.json#
 - lib/sensu/api/http_handler.rb
 - lib/sensu/api/process.rb
 - lib/sensu/api/routes.rb
@@ -279,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A monitoring framework