sensu 0.9.5.beta.3 → 0.9.5.beta.4

data/lib/sensu/client.rb

@@ -12,10 +12,10 @@ module Sensu
       end
       EM::threadpool_size = 14
       EM::run do
-        client.setup_amqp
+        client.setup_rabbitmq
         client.setup_keepalives
         client.setup_subscriptions
-        client.setup_queue_monitor
+        client.setup_rabbitmq_monitor
         client.setup_standalone
         client.setup_socket
 
@@ -35,8 +35,8 @@ module Sensu
       @checks_in_progress = Array.new
     end
 
-    def setup_amqp
-      @logger.debug('[amqp] -- connecting to rabbitmq')
+    def setup_rabbitmq
+      @logger.debug('[rabbitmq] -- connecting to rabbitmq')
       @rabbitmq = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
       @amq = AMQP::Channel.new(@rabbitmq)
     end
@@ -51,7 +51,9 @@ module Sensu
       @logger.debug('[keepalive] -- setup keepalives')
       publish_keepalive
       @timers << EM::PeriodicTimer.new(30) do
-        publish_keepalive
+        unless @rabbitmq.reconnecting?
+          publish_keepalive
+        end
       end
     end
 
@@ -118,7 +120,7 @@ module Sensu
             @checks_in_progress.delete(check.name)
           end
         else
-          @logger.debug('[execute] -- previous check execution still in progress -- ' + check.name)
+          @logger.warn('[execute] -- previous check execution still in progress -- ' + check.name)
         end
       else
         @logger.warn('[execute] -- unkown check -- ' + check.name)
@@ -148,23 +150,27 @@ module Sensu
             @logger.warn('[subscribe] -- invalid check request: ' + check_request_json)
           end
         rescue JSON::ParserError => error
-          @logger.warn('[subscribe] -- check request must be valid JSON: ' + error.to_s)
+          @logger.warn('[subscribe] -- check request must be valid json: ' + error.to_s)
         end
       end
     end
 
-    def setup_queue_monitor
-      @logger.debug('[monitor] -- setup queue monitor')
+    def setup_rabbitmq_monitor
+      @logger.debug('[monitor] -- setup rabbitmq monitor')
       @timers << EM::PeriodicTimer.new(5) do
-        unless @check_request_queue.subscribed?
-          @logger.warn('[monitor] -- re-subscribing to subscriptions')
-          setup_subscriptions
+        if @rabbitmq.reconnecting?
+          @logger.warn('[monitor] -- reconnecting to rabbitmq')
+        else
+          unless @check_request_queue.subscribed?
+            @logger.warn('[monitor] -- re-subscribing to client subscriptions')
+            setup_subscriptions
+          end
         end
       end
     end
 
     def setup_standalone(options={})
-      @logger.debug('[standalone] -- setup standalone')
+      @logger.debug('[standalone] -- setup standalone checks')
       standalone_check_count = 0
       @settings.checks.each do |name, details|
         if details.standalone
@@ -174,8 +180,10 @@ module Sensu
           @timers << EM::Timer.new(stagger*standalone_check_count) do
             interval = options[:test] ? 0.5 : details.interval
             @timers << EM::PeriodicTimer.new(interval) do
-              check.issued = Time.now.to_i
-              execute_check(check)
+              unless @rabbitmq.reconnecting?
+                check.issued = Time.now.to_i
+                execute_check(check)
+              end
             end
           end
         end
@@ -183,7 +191,7 @@ module Sensu
     end
 
     def setup_socket
-      @logger.debug('[socket] -- starting up socket')
+      @logger.debug('[socket] -- starting up client tcp socket')
       EM::start_server('127.0.0.1', 3030, ClientSocket) do |socket|
         socket.settings = @settings
         socket.logger = @logger
@@ -212,7 +220,7 @@ module Sensu
         timer.cancel
       end
       unless @rabbitmq.reconnecting?
-        @logger.warn('[stop] -- unsubscribing from subscriptions')
+        @logger.warn('[stop] -- unsubscribing from client subscriptions')
         @check_request_queue.unsubscribe do
           stop_reactor
         end
@@ -250,7 +258,7 @@ module Sensu
             send_data('invalid')
           end
         rescue JSON::ParserError => error
-          @logger.warn('[socket] -- check result must be valid JSON: ' + error.to_s)
+          @logger.warn('[socket] -- check result must be valid json: ' + error.to_s)
           send_data('invalid')
         end
       end

data/lib/sensu/config.rb

@@ -204,7 +204,7 @@ module Sensu
             config_hash[key] ||= Hash.new
           end
         rescue JSON::ParserError => error
-          invalid_config('configuration file (' + @options[:config_file] + ') must be valid JSON: ' + error.to_s)
+          invalid_config('configuration file (' + @options[:config_file] + ') must be valid json: ' + error.to_s)
         end
         @settings = Hashie::Mash.new(config_hash)
       else
@@ -216,7 +216,7 @@ module Sensu
             begin
               snippet_hash = JSON.parse(File.open(snippet_file, 'r').read)
             rescue JSON::ParserError => error
-              invalid_config('configuration snippet file (' + snippet_file + ') must be valid JSON: ' + error.to_s)
+              invalid_config('configuration snippet file (' + snippet_file + ') must be valid json: ' + error.to_s)
             end
             merged_settings = @settings.to_hash.deep_merge(snippet_hash)
             @logger.warn('[settings] -- configuration snippet (' + snippet_file + ') applied changes: ' + @settings.deep_diff(merged_settings).to_json)

data/lib/sensu/patches/redis.rb

@@ -8,14 +8,14 @@ module Redis
       if @redis_password
         auth(@redis_password).callback do |reply|
           unless reply == "OK"
-            raise 'could not authenticate'
+            raise('could not authenticate')
           end
         end
       end
       info.callback do |reply|
         redis_version = reply.split(/\n/).first.split(/:/).last
         unless redis_version.to_i >= 2
-          raise 'redis version must be >= 2.0'
+          raise('redis version must be >= 2.0')
         end
       end
     end
@@ -36,7 +36,7 @@ module Redis
           @queue.shift.fail RuntimeError.new('connection closed')
         end
         unless @connected
-          raise 'could not connect to redis'
+          raise('could not connect to redis')
         end
       end
     end

data/lib/sensu/patches/ruby.rb

@@ -48,14 +48,14 @@ end
 module Process
   def self.write_pid(pid_file)
     if pid_file.nil?
-      raise 'a pid file path must be provided'
+      raise('a pid file path must be provided')
     end
     begin
       File.open(pid_file, 'w') do |file|
         file.write(self.pid.to_s + "\n")
       end
     rescue
-      raise 'could not write to pid file: ' + pid_file
+      raise('could not write to pid file: ' + pid_file)
     end
   end
 
@@ -63,7 +63,7 @@ module Process
     srand
     fork and exit
     unless session_id = self.setsid
-      raise 'cannot detach from controlling terminal'
+      raise('cannot detach from controlling terminal')
     end
     trap 'SIGHUP', 'IGNORE'
     if pid = fork

data/lib/sensu/server.rb

@@ -19,11 +19,11 @@ module Sensu
       EM::threadpool_size = 14
       EM::run do
         server.setup_redis
-        server.setup_amqp
+        server.setup_rabbitmq
         server.setup_keepalives
         server.setup_results
         server.setup_master_monitor
-        server.setup_queue_monitor
+        server.setup_rabbitmq_monitor
 
         %w[INT TERM].each do |signal|
           Signal.trap(signal) do
@@ -46,8 +46,8 @@ module Sensu
       @redis = Redis.connect(@settings.redis.to_hash.symbolize_keys)
     end
 
-    def setup_amqp
-      @logger.debug('[amqp] -- connecting to rabbitmq')
+    def setup_rabbitmq
+      @logger.debug('[rabbitmq] -- connecting to rabbitmq')
       @rabbitmq = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
       @amq = AMQP::Channel.new(@rabbitmq)
     end
@@ -243,9 +243,11 @@ module Sensu
             details.subscribers.each do |exchange|
               interval = options[:test] ? 0.5 : details.interval
               @timers << EM::PeriodicTimer.new(interval) do
-                @logger.info('[publisher] -- publishing check request -- ' + name + ' -- ' + exchange)
-                check_request.issued = Time.now.to_i
-                @amq.fanout(exchange).publish(check_request.to_json)
+                unless @rabbitmq.reconnecting?
+                  @logger.info('[publisher] -- publishing check request -- ' + name + ' -- ' + exchange)
+                  check_request.issued = Time.now.to_i
+                  @amq.fanout(exchange).publish(check_request.to_json)
+                end
               end
             end
           end
@@ -325,11 +327,15 @@ module Sensu
       if @is_master
         @redis.del('lock:master').callback do
           @logger.warn('[master] -- resigned as master')
-          block.call if block
+          if block
+            block.call
+          end
         end
       else
         @logger.warn('[master] -- not currently master')
-        block.call if block
+        if block
+          block.call
+        end
       end
     end
 
@@ -347,16 +353,20 @@ module Sensu
       end
     end
 
-    def setup_queue_monitor
-      @logger.debug('[monitor] -- setup queue monitor')
+    def setup_rabbitmq_monitor
+      @logger.debug('[monitor] -- setup rabbitmq monitor')
       @timers << EM::PeriodicTimer.new(5) do
-        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
+        if @rabbitmq.reconnecting?
+          @logger.warn('[monitor] -- reconnecting to rabbitmq')
+        else
+          unless @keepalive_queue.subscribed?
+            @logger.warn('[monitor] -- re-subscribing to keepalives')
+            setup_keepalives
+          end
+          unless @result_queue.subscribed?
+            @logger.warn('[monitor] -- re-subscribing to results')
+            setup_results
+          end
         end
       end
     end

data/lib/sensu/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196253
+  hash: 62196243
   prerelease: true
   segments: 
   - 0
   - 9
   - 5
   - beta
-  - 3
-  version: 0.9.5.beta.3
+  - 4
+  version: 0.9.5.beta.4
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-20 00:00:00 -07:00
+date: 2012-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency