sensu 0.13.0.alpha.2 → 0.13.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791f89558873702eb221fd48783c9c10c058e26f
-  data.tar.gz: e7a4e93caced70dc3dd5b93d29815f018c4634ee
+  metadata.gz: fb0b42351e78060c0d98db18dab7eda10d3454bb
+  data.tar.gz: d0427f69c4aa2ff78df74388c8fe25db2d4bda37
 SHA512:
-  metadata.gz: f1adae9a398a3de29d65bc5c08e6cd3a53ebb1653896d21497d57857baaa19c3ef4a0fbf5d4d9d43c57274455f72bb757ce3abcfd9750f8e8b2689ea3c5c24d3
-  data.tar.gz: 644e45b48c17137c43c8c6447f750b4a6a2f97c38e71ced938184d36b071348f0bea72114fa4cf628bb917a9826ffbf90af976950441221913fdf0334518aa17
+  metadata.gz: c018ea24b885b250bd4c34ccadc1b5a96e02c43eaf5ee9671042afb5c4f8d59312ba9ec90477eb69c2161cb20afebdc643fa1f846d78a66bcd5c33f50bfdc55a
+  data.tar.gz: 2556a259aff1f186d6dc1aa1c61d5799da2bfc88bda700f531b1c52656b67c45b082a777d92cee35971da2b767a5333eeee7238e5e44e57c6dad8053b204c0b5

data/CHANGELOG.md

@@ -5,6 +5,8 @@
 API GET /events now provides all event data, the same data passed to event
 handlers.
 
+AMQP handler type ("amqp") has been replaced by "transport".
+
 Standalone check results are no longer merged with check definitions
 residing on the server(s).
 

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -4,10 +4,10 @@ gem 'multi_json', '1.10.1'
 
 gem 'sensu-em', '2.0.0'
 gem 'sensu-logger', '0.0.1'
-gem 'sensu-settings', '0.0.5'
+gem 'sensu-settings', '0.0.7'
 gem 'sensu-extension', '0.0.3'
 gem 'sensu-extensions', '0.0.5'
-gem 'sensu-transport', '0.0.2'
+gem 'sensu-transport', '0.0.6'
 gem 'sensu-spawn', '0.0.3'
 
 require 'time'
@@ -123,17 +123,14 @@ module Sensu
     end
 
     def setup_transport
-      if @settings[:transport].is_a?(Hash)
-        transport_name = @settings[:transport][:name]
-      end
-      transport_name ||= 'rabbitmq'
-      transport_settings = @settings[transport_name.to_sym]
+      transport_name = @settings[:transport][:name] || 'rabbitmq'
+      transport_settings = @settings[transport_name]
       @logger.debug('connecting to transport', {
         :name => transport_name,
         :settings => transport_settings
       })
+      Transport.logger = @logger
       @transport = Transport.connect(transport_name, transport_settings)
-      @transport.logger = @logger
       @transport.on_error do |error|
         @logger.fatal('transport connection error', {
           :error => error.to_s

data/lib/sensu/server.rb

@@ -340,7 +340,7 @@ module Sensu
       @extensions[:bridges].each do |name, bridge|
         bridge.safe_run(event) do |output, status|
           output.each_line do |line|
-            @logger.info('bridge extension output', {
+            @logger.debug('bridge extension output', {
               :extension => bridge.definition,
               :output => line
             })
@@ -632,7 +632,7 @@ module Sensu
           master_duties
         else
           @redis.get('lock:master') do |timestamp|
-            if Time.now.to_i - timestamp.to_i >= 60
+            if Time.now.to_i - timestamp.to_i >= 30
               @redis.getset('lock:master', Time.now.to_i) do |previous|
                 if previous == timestamp
                   @is_master = true
@@ -648,7 +648,7 @@ module Sensu
 
     def setup_master_monitor
       request_master_election
-      @timers[:run] << EM::PeriodicTimer.new(20) do
+      @timers[:run] << EM::PeriodicTimer.new(10) do
         if @is_master
           @redis.set('lock:master', Time.now.to_i) do
             @logger.debug('updated master lock timestamp')
@@ -659,35 +659,16 @@ module Sensu
       end
     end
 
-    def resign_as_master(&block)
-      block ||= Proc.new {}
+    def resign_as_master
       if @is_master
         @logger.warn('resigning as master')
         @timers[:master].each do |timer|
           timer.cancel
         end
         @timers[:master].clear
-        if @redis.connected?
-          @redis.del('lock:master') do
-            @logger.info('removed master lock')
-            @is_master = false
-          end
-        end
-        timestamp = Time.now.to_i
-        retry_until_true do
-          if !@is_master
-            block.call
-            true
-          elsif Time.now.to_i - timestamp >= 3
-            @logger.warn('failed to remove master lock')
-            @is_master = false
-            block.call
-            true
-          end
-        end
+        @is_master = false
       else
         @logger.debug('not currently master')
-        block.call
       end
     end
 
@@ -729,11 +710,10 @@ module Sensu
         end
         @timers[:run].clear
         unsubscribe
-        resign_as_master do
-          @state = :paused
-          if block
-            block.call
-          end
+        resign_as_master
+        @state = :paused
+        if block
+          block.call
         end
       end
     end
@@ -751,8 +731,8 @@ module Sensu
 
     def stop
       @logger.warn('stopping')
-      @state = :stopping
       pause do
+        @state = :stopping
         complete_handlers_in_progress do
           @redis.close
           @transport.close

data/sensu.gemspec

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'sensu', 'constants')
 Gem::Specification.new do |s|
   s.name        = 'sensu'
   s.version     = Sensu::VERSION
-  s.platform    = Gem::Platform::RUBY
+  s.platform    = RUBY_PLATFORM =~ /java/ ? Gem::Platform::JAVA : Gem::Platform::RUBY
   s.authors     = ['Sean Porter', 'Justin Kolberg']
   s.email       = ['portertech@gmail.com', 'justin.kolberg@sonian.net']
   s.homepage    = 'https://github.com/sensu/sensu'
@@ -18,10 +18,10 @@ Gem::Specification.new do |s|
   s.add_dependency('uuidtools', '2.1.4')
   s.add_dependency('sensu-em', '2.0.0')
   s.add_dependency('sensu-logger', '0.0.1')
-  s.add_dependency('sensu-settings', '0.0.5')
+  s.add_dependency('sensu-settings', '0.0.7')
   s.add_dependency('sensu-extension', '0.0.3')
   s.add_dependency('sensu-extensions', '0.0.5')
-  s.add_dependency('sensu-transport', '0.0.2')
+  s.add_dependency('sensu-transport', '0.0.6')
   s.add_dependency('sensu-spawn', '0.0.3')
   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.13.0.alpha.2
+  version: 0.13.0.beta
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: sensu-spawn
   requirement: !ruby/object:Gem::Requirement