sensu 0.14.0 → 0.15.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adea9f9477e945ab2526d28659ef3d236a78f308
-  data.tar.gz: ed54bd09e178e624a28cad223feee4a1d4d50650
+  metadata.gz: 569e92737034cd71fa945830bedb3d7fe66e1905
+  data.tar.gz: 504d8ae1f6068aa9cb735e795c4e2eb12d8d6f40
 SHA512:
-  metadata.gz: 3f8262a436f850447e9bb3be00974503d8e87c0892def21a7484931db63c88c7d646ba23afdcabe3d27bcb742aad081eb2e15f3522ada6ffcbfcb1e6d4c738bf
-  data.tar.gz: 85501da63da2b4352a0719893014e960b1c791d87a9939e4b544e176d2c1ad0e832e9b9bb98bb0cb66fc867ab18817a2d0f5f017a45b56bdd36eb0bda05f3b88
+  metadata.gz: 2070b2904803138bb6020d31d3044e992319eb76f973ff412f23f31562d862ac185c89ace825e5407bfd2737c0b3d435a07a439e69dd09cd5cc337e5a7e4cee8
+  data.tar.gz: 98e1abd0e4e15e2caf86da808c396522cd08be1724e2a9109ee4c4544baf441f59fac6c7354444ac0e6cedb5e3625b4e3ddae3f2e811a0f98d8593d9d9330eb6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.15.0 - TBD
+
+### Features
+
+RabbitMQ transport now supports multiple broker connection options,
+enabling connection fail-over to brokers in a cluster without
+using a load balancer.
+
 ## 0.14.0 - 2014-09-29
 
 ### Features

data/lib/sensu/client.rb

@@ -44,9 +44,7 @@ module Sensu
       @logger.debug('scheduling keepalives')
       publish_keepalive
       @timers[:run] << EM::PeriodicTimer.new(20) do
-        unless @state == :paused
-          publish_keepalive
-        end
+        publish_keepalive
       end
     end
 
@@ -195,10 +193,8 @@ module Sensu
         @timers[:run] << EM::Timer.new(scheduling_delay) do
           interval = testing? ? 0.5 : check[:interval]
           @timers[:run] << EM::PeriodicTimer.new(interval) do
-            unless @state == :paused
-              check[:issued] = Time.now.to_i
-              process_check(check.dup)
-            end
+            check[:issued] = Time.now.to_i
+            process_check(check.dup)
           end
         end
       end
@@ -247,21 +243,40 @@ module Sensu
       end
     end
 
-    def start
-      setup_transport
+    def bootstrap
       setup_keepalives
       setup_subscriptions
       setup_standalone
+      @state = :running
+    end
+
+    def start
+      setup_transport
       setup_sockets
-      super
+      bootstrap
+    end
+
+    def pause
+      super do
+        @transport.unsubscribe
+      end
+    end
+
+    def resume
+      retry_until_true(1) do
+        if @state == :paused
+          if @transport.connected?
+            bootstrap
+            true
+          end
+        end
+      end
     end
 
     def stop
       @logger.warn('stopping')
-      @timers[:run].each do |timer|
-        timer.cancel
-      end
-      @transport.unsubscribe
+      pause
+      @state = :stopping
       complete_checks_in_progress do
         @transport.close
         super

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.14.0'
+    VERSION = '0.15.0.beta'
 
     SEVERITIES = %w[ok warning critical unknown]
 

data/lib/sensu/daemon.rb

@@ -7,7 +7,7 @@ gem 'sensu-logger', '1.0.0'
 gem 'sensu-settings', '1.2.0'
 gem 'sensu-extension', '1.0.0'
 gem 'sensu-extensions', '1.0.0'
-gem 'sensu-transport', '1.0.0'
+gem 'sensu-transport', '2.0.0'
 gem 'sensu-spawn', '1.1.0'
 
 require 'time'
@@ -90,8 +90,18 @@ module Sensu
       @state = :running
     end
 
-    def pause
-      @state = :paused
+    def pause(&block)
+      unless @state == :pausing || @state == :paused
+        @state = :pausing
+        @timers[:run].each do |timer|
+          timer.cancel
+        end
+        @timers[:run].clear
+        if block
+          block.call
+        end
+        @state = :paused
+      end
     end
 
     def resume

data/lib/sensu/server.rb

@@ -727,19 +727,10 @@ module Sensu
       bootstrap
     end
 
-    def pause(&block)
-      unless @state == :pausing || @state == :paused
-        @state = :pausing
-        @timers[:run].each do |timer|
-          timer.cancel
-        end
-        @timers[:run].clear
+    def pause
+      super do
         unsubscribe
         resign_as_master
-        @state = :paused
-        if block
-          block.call
-        end
       end
     end
 
@@ -756,13 +747,12 @@ module Sensu
 
     def stop
       @logger.warn('stopping')
-      pause do
-        @state = :stopping
-        complete_handlers_in_progress do
-          @redis.close
-          @transport.close
-          super
-        end
+      pause
+      @state = :stopping
+      complete_handlers_in_progress do
+        @redis.close
+        @transport.close
+        super
       end
     end
   end

data/sensu.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency('sensu-settings', '1.2.0')
   s.add_dependency('sensu-extension', '1.0.0')
   s.add_dependency('sensu-extensions', '1.0.0')
-  s.add_dependency('sensu-transport', '1.0.0')
+  s.add_dependency('sensu-transport', '2.0.0')
   s.add_dependency('sensu-spawn', '1.1.0')
   s.add_dependency('em-redis-unified', '0.5.0')
   s.add_dependency('sinatra', '1.3.5')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0.beta
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sensu-spawn
   requirement: !ruby/object:Gem::Requirement
@@ -279,9 +279,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2