sensu-transport 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63345aafded68e4d6a2343b8226458471e69c9f3
-  data.tar.gz: 64945aae01510c75c7c981099c5d9ec3ffed582b
+  metadata.gz: b75aa1f55c161361c685e44c5ca7672e921c0894
+  data.tar.gz: fe76b30902129c7b3c0af15eedc09c8629db138c
 SHA512:
-  metadata.gz: c272ca702a01fcd74f58004a666fd52e2f4784b99b3b10db355833d0ed300d826e3b6302189aa5191bfa12b744bc58d815505bc7e57399724c271b1bdf96bd10
-  data.tar.gz: df211a9ecb3b7cab4a4da3c72f0610a522ca36d52704b3283b0873ec45b0542de64ce467c80c5bd572160464a22f0532cd8f01822143bb3f93d215ce28976301
+  metadata.gz: 86fef9f71bc8eeb8f08fd5ab651621021d4d8e06893dc1876dc743cd91fc5b70529cfefe75514008bb40c0ccc8867c5721326ae447e355145efceb56b9bf1e1b
+  data.tar.gz: 24ef7945805c03737ef76ccd3850c77dfdf5b751b7841f81a8cc6762ffc98b0068487c2514999123544e1e96eba74474396c247a967f0521dad8ed729f3d5d4b

data/lib/sensu/transport/rabbitmq.rb

@@ -37,22 +37,24 @@ module Sensu
       #
       # @return [TrueClass, FalseClass]
       def connected?
-        [@publisher_connection, @consumer_connection].all? do |connection|
+        [@primary_connection, @secondary_connection].all? do |connection|
           connection && connection.connected?
         end
       end
 
-      # Close the RabbitMQ connection.
+      # Close the RabbitMQ connections.
       def close
         callback = Proc.new do
-          [@publisher_connection, @consumer_connection].each do |connection|
+          [@primary_connection, @secondary_connection].each do |connection|
             connection && connection.close
           end
         end
         connected? ? callback.call : EM.next_tick(callback)
       end
 
-      # Publish a message to RabbitMQ.
+      # Publish a message to RabbitMQ. This method will only use the
+      # primary channel for publishing keepalive, otherwise it will
+      # use the secondary channel.
       #
       # @param type [Symbol] the RabbitMQ exchange type, possible
       #   values are: :direct and :fanout.
@@ -66,7 +68,8 @@ module Sensu
       def publish(type, pipe, message, options={})
         if connected?
           catch_errors do
-            @publisher_channel.method(type.to_sym).call(pipe, options).publish(message) do
+            channel = (pipe == "keepalives" ? @primary_channel : @secondary_channel)
+            channel.method(type.to_sym).call(pipe, options).publish(message) do
               info = {}
               yield(info) if block_given?
             end
@@ -91,9 +94,9 @@ module Sensu
       def subscribe(type, pipe, funnel="", options={}, &callback)
         catch_errors do
           previously_declared = @queues.has_key?(funnel)
-          @queues[funnel] ||= @consumer_channel.queue!(funnel, :auto_delete => true)
+          @queues[funnel] ||= @primary_channel.queue!(funnel, :auto_delete => true)
           queue = @queues[funnel]
-          queue.bind(@consumer_channel.method(type.to_sym).call(pipe))
+          queue.bind(@primary_channel.method(type.to_sym).call(pipe))
           unless previously_declared
             queue.subscribe(options, &callback)
           end
@@ -116,7 +119,7 @@ module Sensu
             end
           end
           @queues = {}
-          @consumer_channel.recover if connected?
+          @primary_channel.recover if connected?
         end
         super
       end
@@ -145,7 +148,7 @@ module Sensu
       def stats(funnel, options={})
         catch_errors do
           options = options.merge(:auto_delete => true)
-          @consumer_channel.queue(funnel, options).status do |messages, consumers|
+          @primary_channel.queue(funnel, options).status do |messages, consumers|
             info = {
               :messages => messages,
               :consumers => consumers
@@ -175,7 +178,7 @@ module Sensu
       def reset
         @queues = {}
         @connection_timeout.cancel if @connection_timeout
-        [@publisher_connection, @consumer_connection].each do |connection|
+        [@primary_connection, @secondary_connection].each do |connection|
           connection && connection.close_connection
         end
       end
@@ -208,8 +211,12 @@ module Sensu
         end
       end
 
-      def connection_ready(&callback)
-        if connected?
+      def channels_ready?(&callback)
+        ready = [@primary_channel, @secondary_channel].all? do |channel|
+          channel && channel.status == :opened
+        end
+        if ready
+          @logger.debug("transport connection ready")
           @connection_timeout.cancel
           succeed
           callback.call if callback
@@ -234,7 +241,6 @@ module Sensu
         connection.logger = @logger
         connection.on_open do
           @logger.debug("transport connection open")
-          connection_ready(&callback)
         end
         connection.on_tcp_connection_loss do
           @logger.warn("transport connection error", :reason => "tcp connection lost")
@@ -265,15 +271,18 @@ module Sensu
           prefetch = options.fetch(:prefetch, 1)
         end
         channel.prefetch(prefetch)
+        channel.once_open do
+          channels_ready?(&callback)
+        end
         channel
       end
 
       def connect_with_eligible_options(&callback)
         next_connection_options do |options|
-          @publisher_connection = setup_connection(options, &callback)
-          @publisher_channel = setup_channel(options, @publisher_connection)
-          @consumer_connection = setup_connection(options, &callback)
-          @consumer_channel = setup_channel(options, @consumer_connection)
+          @primary_connection = setup_connection(options, &callback)
+          @primary_channel = setup_channel(options, @primary_connection)
+          @secondary_connection = setup_connection(options, &callback)
+          @secondary_channel = setup_channel(options, @secondary_connection)
         end
       end
 

data/sensu-transport.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-transport"
-  spec.version       = "8.0.0"
+  spec.version       = "8.1.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com", "engineering@sensu.io"]
   spec.summary       = "The Sensu transport abstraction library"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-transport
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Sean Porter
@@ -30,7 +30,7 @@ cert_chain:
   jOeGyhtQa9j4FFmsEJDg59f5v/3hECXsa3Xuml3foaFHzX3Ya/YIyd2YFxvkFKIu
   GVbe7A3YdxzdkH2Es/Ym9twdxXaIDdXzj8sWhw==
   -----END CERTIFICATE-----
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine