sensu 0.11.0.beta.3 → 0.11.0.beta.4

data/CHANGELOG.md

@@ -24,9 +24,6 @@ from log events and keepalives, eg. "client": { "redact": [
 You can configure the Sensu client socket (UDP & TCP), bind & port, eg.
 "client": { "socket": { "bind": "0.0.0.0", "port": 4040 } }.
 
-You can choose to reconnect to RabbitMQ on initial TCP connection
-failure, eg. "rabbitmq": { "on_failure": "reconnect" }.
-
 Handlers & mutators can now have a timeout, in seconds.
 
 ### Other
@@ -51,6 +48,9 @@ backlog, stale data that may overwhelm the recovering consumers.
 
 Improved Sensu client socket check validation.
 
+AMQP connection will time out if the vhost is missing, there is a lack
+of permissions, or authentication fails.
+
 ## 0.10.2 - 2013-07-18
 
 ### Other

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.11.0.beta.3'
+    VERSION = '0.11.0.beta.4'
 
     LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
 

data/lib/sensu/rabbitmq.rb

@@ -47,26 +47,28 @@ module Sensu
     end
 
     def connect(options={})
+      timeout = EM::Timer.new(10) do
+        error = RabbitMQError.new('timed out while attempting to connect')
+        @on_error.call(error)
+      end
       on_failure = Proc.new do
-        error = RabbitMQError.new('cannot connect to rabbitmq')
+        error = RabbitMQError.new('failed to connect')
         @on_error.call(error)
       end
+      @connection = AMQP.connect(options, {
+        :on_tcp_connection_failure => on_failure,
+        :on_possible_authentication_failure => on_failure
+      })
+      @connection.logger = Logger.get
+      @connection.on_open do
+        timeout.cancel
+      end
       reconnect = Proc.new do
         unless @connection.reconnecting?
           @before_reconnect.call
           @connection.periodically_reconnect(5)
         end
       end
-      if options.is_a?(Hash)
-        if options[:on_failure] == 'reconnect'
-          on_failure = reconnect
-        end
-      end
-      @connection = AMQP.connect(options, {
-        :on_tcp_connection_failure => on_failure,
-        :on_possible_authentication_failure => on_failure
-      })
-      @connection.logger = Logger.get
       @connection.on_tcp_connection_loss(&reconnect)
       @connection.on_skipped_heartbeats(&reconnect)
       @channel = AMQP::Channel.new(@connection)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 1103939663
+  hash: 346800981
   prerelease: true
   segments: 
   - 0
   - 11
   - 0
   - beta
-  - 3
-  version: 0.11.0.beta.3
+  - 4
+  version: 0.11.0.beta.4
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-20 00:00:00 -07:00
+date: 2013-09-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency