sensu 0.9.0.beta.4 → 0.9.0

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.0.beta.4"
+  VERSION = "0.9.0"
 end

data/lib/sensu/api.rb

@@ -29,7 +29,9 @@ module Sensu
       if options[:daemonize]
         Process.daemonize
       end
-      Process.write_pid(options[:pid_file])
+      if options[:pid_file]
+        Process.write_pid(options[:pid_file])
+      end
       $logger.debug('[setup] -- connecting to redis')
       $redis = Redis.connect($settings.redis.to_hash.symbolize_keys)
       $logger.debug('[setup] -- connecting to rabbitmq')

data/lib/sensu/client.rb

@@ -7,7 +7,9 @@ module Sensu
       if options[:daemonize]
         Process.daemonize
       end
-      Process.write_pid(options[:pid_file])
+      if options[:pid_file]
+        Process.write_pid(options[:pid_file])
+      end
       EM.run do
         client.setup_amqp
         client.setup_keepalives
@@ -30,7 +32,7 @@ module Sensu
     end
 
     def stop(signal)
-      @logger.warn('[process] -- ' + signal + ' -- stopping sensu client')
+      @logger.warn('[stop] -- stopping sensu client -- ' + signal)
       EM.add_timer(1) do
         EM.stop
       end
@@ -160,7 +162,7 @@ module Sensu
       @logger.debug('[monitor] -- setup queue monitor')
       EM.add_periodic_timer(5) do
         unless @check_queue.subscribed?
-          @logger.warn('[monitor] -- reconnecting to rabbitmq')
+          @logger.warn('[monitor] -- re-subscribing to subscriptions')
           @check_queue.delete
           EM.add_timer(1) do
             setup_subscriptions
@@ -170,7 +172,7 @@ module Sensu
     end
 
     def setup_socket
-      @logger.debug('[socket] -- starting up socket server')
+      @logger.debug('[socket] -- starting up socket')
       EM.start_server('127.0.0.1', 3030, ClientSocket) do |socket|
         socket.settings = @settings
         socket.logger = @logger
@@ -196,7 +198,7 @@ module Sensu
             :check => check.to_hash
           }.to_json)
         else
-          @logger.warn('[socket] -- a check name, exit status, and output are required -- e.g. {name: x, status: 0, output: "y"}')
+          @logger.warn('[socket] -- a check name, exit status, and output are required -- e.g. {"name": "x", "status": 0, output: "y"}')
         end
       rescue JSON::ParserError => error
         @logger.warn('[socket] -- check result must be valid JSON: ' + error.to_s)

data/lib/sensu/config.rb

@@ -55,8 +55,10 @@ module Sensu
       end
       @logger.subscribe(Cabin::Outputs::EmStdlibLogger.new(ruby_logger))
       @logger.level = @options[:verbose] ? :debug : :info
-      Signal.trap('USR1') do
-        @logger.level = @logger.level == :info ? :debug : :info
+      if Signal.list.include?('USR1')
+        Signal.trap('USR1') do
+          @logger.level = @logger.level == :info ? :debug : :info
+        end
       end
       @logger
     end

data/lib/sensu/server.rb

@@ -13,7 +13,9 @@ module Sensu
       if options[:daemonize]
         Process.daemonize
       end
-      Process.write_pid(options[:pid_file])
+      if options[:pid_file]
+        Process.write_pid(options[:pid_file])
+      end
       EM.threadpool_size = 16
       EM.run do
         server.setup_redis
@@ -35,15 +37,19 @@ module Sensu
       config = Sensu::Config.new(options)
       @settings = config.settings
       @logger = config.logger || config.open_log
+      @status = nil
     end
 
-    def stop(signal)
-      @logger.warn('[process] -- ' + signal + ' -- stopping sensu server')
-      EM.add_timer(1) do
+    def stop_reactor
+      EM.add_timer(3) do
         EM.stop
       end
     end
 
+    def stopping?
+      @status == :stopping
+    end
+
     def setup_redis
       @logger.debug('[redis] -- connecting to redis')
       @redis = Redis.connect(@settings.redis.to_hash.symbolize_keys)
@@ -230,9 +236,11 @@ module Sensu
               end
               interval = options[:test] ? 0.5 : details.interval
               EM.add_periodic_timer(interval) do
-                check_request.issued = Time.now.to_i
-                @logger.info('[publisher] -- publishing check -- ' + name + ' -- ' + exchange)
-                @amq.fanout(exchange).publish(check_request.to_json)
+                unless stopping?
+                  check_request.issued = Time.now.to_i
+                  @logger.info('[publisher] -- publishing check -- ' + name + ' -- ' + exchange)
+                  @amq.fanout(exchange).publish(check_request.to_json)
+                end
               end
             end
           end
@@ -243,34 +251,36 @@ module Sensu
     def setup_keepalive_monitor
       @logger.debug('[keepalive] -- setup keepalive monitor')
       EM.add_periodic_timer(30) do
-        @logger.debug('[keepalive] -- checking for stale clients')
-        @redis.smembers('clients').callback do |clients|
-          clients.each do |client_id|
-            @redis.get('client:' + client_id).callback do |client_json|
-              client = Hashie::Mash.new(JSON.parse(client_json))
-              time_since_last_keepalive = Time.now.to_i - client.timestamp
-              result = Hashie::Mash.new({
-                :client => client.name,
-                :check => {
-                  :name => 'keepalive',
-                  :issued => Time.now.to_i
-                }
-              })
-              case
-              when time_since_last_keepalive >= 180
-                result.check.status = 2
-                result.check.output = 'No keep-alive sent from host in over 180 seconds'
-                @amq.queue('results').publish(result.to_json)
-              when time_since_last_keepalive >= 120
-                result.check.status = 1
-                result.check.output = 'No keep-alive sent from host in over 120 seconds'
-                @amq.queue('results').publish(result.to_json)
-              else
-                @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
-                  if exists
-                    result.check.status = 0
-                    result.check.output = 'Keep-alive sent from host'
-                    @amq.queue('results').publish(result.to_json)
+        unless stopping?
+          @logger.debug('[keepalive] -- checking for stale clients')
+          @redis.smembers('clients').callback do |clients|
+            clients.each do |client_id|
+              @redis.get('client:' + client_id).callback do |client_json|
+                client = Hashie::Mash.new(JSON.parse(client_json))
+                time_since_last_keepalive = Time.now.to_i - client.timestamp
+                result = Hashie::Mash.new({
+                  :client => client.name,
+                  :check => {
+                    :name => 'keepalive',
+                    :issued => Time.now.to_i
+                  }
+                })
+                case
+                when time_since_last_keepalive >= 180
+                  result.check.status = 2
+                  result.check.output = 'No keep-alive sent from host in over 180 seconds'
+                  @amq.queue('results').publish(result.to_json)
+                when time_since_last_keepalive >= 120
+                  result.check.status = 1
+                  result.check.output = 'No keep-alive sent from host in over 120 seconds'
+                  @amq.queue('results').publish(result.to_json)
+                else
+                  @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
+                    if exists
+                      result.check.status = 0
+                      result.check.output = 'Keep-alive sent from host'
+                      @amq.queue('results').publish(result.to_json)
+                    end
                   end
                 end
               end
@@ -311,13 +321,15 @@ module Sensu
     def setup_master_monitor
       request_master_election
       EM.add_periodic_timer(20) do
-        if @is_master
-          timestamp = Time.now.to_i
-          @redis.set('lock:master', timestamp).callback do
-            @logger.debug('[master] -- updated master lock timestamp -- ' + timestamp.to_s)
+        unless stopping?
+          if @is_master
+            timestamp = Time.now.to_i
+            @redis.set('lock:master', timestamp).callback do
+              @logger.debug('[master] -- updated master lock timestamp -- ' + timestamp.to_s)
+            end
+          else
+            request_master_election
           end
-        else
-          request_master_election
         end
       end
     end
@@ -325,13 +337,34 @@ module Sensu
     def setup_queue_monitor
       @logger.debug('[monitor] -- setup queue monitor')
       EM.add_periodic_timer(5) do
-        unless @keepalive_queue.subscribed?
-          @logger.warn('[monitor] -- reconnecting to rabbitmq -- keepalives')
-          setup_keepalives
+        unless stopping?
+          unless @keepalive_queue.subscribed?
+            @logger.warn('[monitor] -- re-subscribing to rabbitmq queue -- keepalives')
+            setup_keepalives
+          end
+          unless @result_queue.subscribed?
+            @logger.warn('[monitor] -- re-subscribing to rabbitmq queue -- results')
+            setup_results
+          end
         end
-        unless @result_queue.subscribed?
-          @logger.warn('[monitor] -- reconnecting to rabbitmq -- results')
-          setup_results
+      end
+    end
+
+    def stop(signal)
+      @logger.warn('[stop] -- stopping sensu server -- ' + signal)
+      @status = :stopping
+      @keepalive_queue.unsubscribe do
+        @logger.warn('[stop] -- unsubscribed from rabbitmq queue -- keepalives')
+        @result_queue.unsubscribe do
+          @logger.warn('[stop] -- unsubscribed from rabbitmq queue -- results')
+          if @is_master
+            @redis.del('lock:master').callback do
+              @logger.warn('[stop] -- resigned as master')
+              stop_reactor
+            end
+          else
+            stop_reactor
+          end
         end
       end
     end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196283
-  prerelease: true
+  hash: 59
+  prerelease: false
   segments: 
   - 0
   - 9
   - 0
-  - beta
-  - 4
-  version: 0.9.0.beta.4
+  version: 0.9.0
 platform: ruby
 authors: 
 - Sean Porter
@@ -260,14 +258,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: