sensu 0.14.0-java → 0.15.0.beta.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328d24e5e21e7d4ae6f0d39723a6a6e7f7725df9
-  data.tar.gz: 34a1af82a31abf17d0c481960923244fabb140d6
+  metadata.gz: f1055408b4fb4a2fd220e4bf8c1566d9b169e4be
+  data.tar.gz: fae5db2afdf20354911471d3bcf37bb78cc259ed
 SHA512:
-  metadata.gz: bfd5d13ed7e66cb3cde4d50b904dbfff4d5447f72425a8ea5822301d228bb3ccd06edf41429d2908994e4c41070905c7e55554d57d2e2f28b401360f238f2c00
-  data.tar.gz: bb0f2ecf54df0a04c5f9ee7ad2bf279b8702e6747a6a289575caffa16dfba4edcc24f7fa6b58b84f28aec9edff3431bd42c3d40e5558d248336d753e7a3b75d5
+  metadata.gz: 290a55ba701322935d0457486c18d168cd7db68beea2feb99f7ec7db287573965861659c8eacbeb8ede86b59c7ee9d5511949acad5d46232839eb82ba06a4f4c
+  data.tar.gz: 91c1b5eeac505146d535f238ed87285a2d3cb183db1985146c6f6a3c59d6fb3298303b11a2fc02057ddaded58f9e67bf78a1a507d7fefec5d26c8e558cd674e6

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,46 @@ 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
+      unless @state == :pausing || @state == :paused
+        @state = :pausing
+        @timers[:run].each do |timer|
+          timer.cancel
+        end
+        @timers[:run].clear
+        @transport.unsubscribe
+        @state = :paused
+      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.1'
 
     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'

data/lib/sensu/server.rb

@@ -727,7 +727,7 @@ module Sensu
       bootstrap
     end
 
-    def pause(&block)
+    def pause
       unless @state == :pausing || @state == :paused
         @state = :pausing
         @timers[:run].each do |timer|
@@ -737,9 +737,6 @@ module Sensu
         unsubscribe
         resign_as_master
         @state = :paused
-        if block
-          block.call
-        end
       end
     end
 
@@ -756,13 +753,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.1
 platform: java
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -115,12 +115,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -265,9 +265,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.1.9