sensu 0.13.0.alpha → 0.13.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e1b021d3461d4daef8432adea63250ae659bb10
-  data.tar.gz: b00ffdcb7989eba387b66777b5b6cd04abf1264d
+  metadata.gz: 1c545c1cfe6cab6e0d221ae034680947c39aa6b6
+  data.tar.gz: ec92277b4be277c058b8b244f5e07c91a8ac4d64
 SHA512:
-  metadata.gz: d324be84c52252df92c88c1e1691a4917aba28c29c520a482ea27b4c46c7c3fcfe30a569cde6cd6464ecaecf631fee7f86b9cc99186ec5d6725cb27a8c9af7f0
-  data.tar.gz: 1c0d83d4bcf511709f0abed6624e293ad5037a32e3f221225c46247ebef1284fc5a332aaa3013b951b075b4233c85a9bdb3e94f9e1f60338a3a1f5da4ec07094
+  metadata.gz: 1e6a1ff938fc9149c8567ce7ddd981da5cb15a895dcd629446375960564894e5b7ed3745aaea70612570cfdcf828fe8e8db1c0d8e99b1ecfce07b31f68022b37
+  data.tar.gz: 4fd59781a991385d0d346b74e902fab82038fc5c260a969fbc0e5d7b8ff2837450cb09c515561cb3ec1c5bf3a107f8b25fc3fa922d03a9c2f233dbbcc95ff18e

data/lib/sensu/api.rb

@@ -1,10 +1,13 @@
 require 'sensu/daemon'
 
-gem 'thin', '1.5.0'
 gem 'sinatra', '1.3.5'
 gem 'async_sinatra', '1.0.0'
 
-require 'thin'
+unless RUBY_PLATFORM =~ /java/
+  gem 'thin', '1.5.0'
+  require 'thin'
+end
+
 require 'sinatra/async'
 
 module Sensu
@@ -16,41 +19,66 @@ module Sensu
 
       def run(options={})
         bootstrap(options)
+        setup_process(options)
         EM::run do
           start
           setup_signal_traps
         end
       end
 
+      def on_reactor_run
+        EM::next_tick do
+          setup_redis
+          set :redis, @redis
+          setup_transport
+          set :transport, @transport
+        end
+      end
+
       def bootstrap(options)
         setup_logger(options)
         set :logger, @logger
         load_settings(options)
+        set :checks, @settings[:checks]
+        set :all_checks, @settings.checks
         if @settings[:api][:user] && @settings[:api][:password]
           use Rack::Auth::Basic do |user, password|
             user == @settings[:api][:user] && password == @settings[:api][:password]
           end
         end
-        set :checks, @settings[:checks]
-        set :all_checks, @settings.checks
-        setup_process(options)
+        on_reactor_run
+        self
       end
 
-      def start
-        setup_redis
-        set :redis, @redis
-        setup_transport
-        set :transport, @transport
+      def start_server
         Thin::Logging.silent = true
         bind = @settings[:api][:bind] || '0.0.0.0'
-        Thin::Server.start(bind, @settings[:api][:port], self)
+        @thin = Thin::Server.new(bind, @settings[:api][:port], self)
+        @thin.start
+      end
+
+      def stop_server(&block)
+        @thin.stop
+        retry_until_true do
+          unless @thin.running?
+            block.call
+            true
+          end
+        end
+      end
+
+      def start
+        start_server
+        super
       end
 
       def stop
         @logger.warn('stopping')
-        @redis.close
-        @transport.close
-        super
+        stop_server do
+          @redis.close
+          @transport.close
+          super
+        end
       end
 
       def test(options={})

data/lib/sensu/constants.rb

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

data/sensu.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |s|
   s.add_dependency('sensu-transport', '0.0.2')
   s.add_dependency('sensu-spawn', '0.0.3')
   s.add_dependency('em-redis-unified', '0.4.2')
-  s.add_dependency('thin', '1.5.0')
   s.add_dependency('sinatra', '1.3.5')
   s.add_dependency('async_sinatra', '1.0.0')
+  s.add_dependency('thin', '1.5.0') unless RUBY_PLATFORM =~ /java/
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.13.0.alpha
+  version: 0.13.0.alpha.1
 platform: ruby
 authors:
 - Sean Porter
@@ -152,47 +152,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.2
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: async_sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: async_sinatra
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement