sensu-transport 7.1.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0a7bf7281d8344c9f733e8b3f4b35bbaf94f90
-  data.tar.gz: bdc629bc7e426c81e4858c30040709f52cfd4ff3
+  metadata.gz: 63345aafded68e4d6a2343b8226458471e69c9f3
+  data.tar.gz: 64945aae01510c75c7c981099c5d9ec3ffed582b
 SHA512:
-  metadata.gz: 3e736805fb8440fc3406fd107a80308f5f0fa5e9195a9f2db509b9e6f047793d398628a88d98dc9801fb490068791640f5f732480ff1b49be84ceae518a3992e
-  data.tar.gz: e0f8829cdf14c594f88e7e16931b01b4e88c232b4cbbfecc111510c1bfeedee3e1fd094ea0a0cc1f0e406bca3e0e16125f1a780dbeabc104dceea5e9bd6cddf5
+  metadata.gz: c272ca702a01fcd74f58004a666fd52e2f4784b99b3b10db355833d0ed300d826e3b6302189aa5191bfa12b744bc58d815505bc7e57399724c271b1bdf96bd10
+  data.tar.gz: df211a9ecb3b7cab4a4da3c72f0610a522ca36d52704b3283b0873ec45b0542de64ce467c80c5bd572160464a22f0532cd8f01822143bb3f93d215ce28976301

data/lib/sensu/transport/rabbitmq.rb

@@ -37,12 +37,18 @@ module Sensu
       #
       # @return [TrueClass, FalseClass]
       def connected?
-        @connection && @connection.connected?
+        [@publisher_connection, @consumer_connection].all? do |connection|
+          connection && connection.connected?
+        end
       end
 
       # Close the RabbitMQ connection.
       def close
-        callback = Proc.new { @connection.close }
+        callback = Proc.new do
+          [@publisher_connection, @consumer_connection].each do |connection|
+            connection && connection.close
+          end
+        end
         connected? ? callback.call : EM.next_tick(callback)
       end
 
@@ -60,7 +66,7 @@ module Sensu
       def publish(type, pipe, message, options={})
         if connected?
           catch_errors do
-            @channel.method(type.to_sym).call(pipe, options).publish(message) do
+            @publisher_channel.method(type.to_sym).call(pipe, options).publish(message) do
               info = {}
               yield(info) if block_given?
             end
@@ -85,9 +91,9 @@ module Sensu
       def subscribe(type, pipe, funnel="", options={}, &callback)
         catch_errors do
           previously_declared = @queues.has_key?(funnel)
-          @queues[funnel] ||= @channel.queue!(funnel, :auto_delete => true)
+          @queues[funnel] ||= @consumer_channel.queue!(funnel, :auto_delete => true)
           queue = @queues[funnel]
-          queue.bind(@channel.method(type.to_sym).call(pipe))
+          queue.bind(@consumer_channel.method(type.to_sym).call(pipe))
           unless previously_declared
             queue.subscribe(options, &callback)
           end
@@ -110,7 +116,7 @@ module Sensu
             end
           end
           @queues = {}
-          @channel.recover if connected?
+          @consumer_channel.recover if connected?
         end
         super
       end
@@ -139,7 +145,7 @@ module Sensu
       def stats(funnel, options={})
         catch_errors do
           options = options.merge(:auto_delete => true)
-          @channel.queue(funnel, options).status do |messages, consumers|
+          @consumer_channel.queue(funnel, options).status do |messages, consumers|
             info = {
               :messages => messages,
               :consumers => consumers
@@ -169,7 +175,9 @@ module Sensu
       def reset
         @queues = {}
         @connection_timeout.cancel if @connection_timeout
-        @connection.close_connection if @connection
+        [@publisher_connection, @consumer_connection].each do |connection|
+          connection && connection.close_connection
+        end
       end
 
       def set_connection_options(options)
@@ -186,7 +194,7 @@ module Sensu
         if @eligible_options.nil? || @eligible_options.empty?
           @eligible_options = @connection_options.shuffle
         end
-        options = @eligible_options.shift
+        options = @eligible_options.shift || {}
         if options.is_a?(Hash) && options[:host]
           resolve_host(options[:host]) do |ip_address|
             if ip_address.nil?
@@ -200,7 +208,17 @@ module Sensu
         end
       end
 
-      def setup_connection(options={})
+      def connection_ready(&callback)
+        if connected?
+          @connection_timeout.cancel
+          succeed
+          callback.call if callback
+        end
+      end
+
+      # @param options [Hash]
+      # @return [Object] RabbitMQ connection.
+      def setup_connection(options={}, &callback)
         reconnect_callback = Proc.new { reconnect }
         on_possible_auth_failure = Proc.new {
           @logger.warn("transport connection error", {
@@ -209,34 +227,36 @@ module Sensu
           })
           reconnect
         }
-        @connection = AMQP.connect(options, {
+        connection = AMQP.connect(options, {
           :on_tcp_connection_failure => reconnect_callback,
           :on_possible_authentication_failure => on_possible_auth_failure
         })
-        @connection.logger = @logger
-        @connection.on_open do
+        connection.logger = @logger
+        connection.on_open do
           @logger.debug("transport connection open")
-          @connection_timeout.cancel
-          succeed
-          yield if block_given?
+          connection_ready(&callback)
         end
-        @connection.on_tcp_connection_loss do
+        connection.on_tcp_connection_loss do
           @logger.warn("transport connection error", :reason => "tcp connection lost")
           reconnect
         end
-        @connection.on_skipped_heartbeats do
+        connection.on_skipped_heartbeats do
           @logger.warn("transport connection error", :reason => "skipped heartbeats")
           reconnect
         end
-        @connection.on_closed do
+        connection.on_closed do
           @logger.debug("transport connection closed")
         end
+        connection
       end
 
-      def setup_channel(options={})
-        @channel = AMQP::Channel.new(@connection)
-        @channel.auto_recovery = true
-        @channel.on_error do |channel, channel_close|
+      # @param options [Hash]
+      # @param connection [Object] RabbitMQ connection.
+      # @return [Object] RabbitMQ connection channel.
+      def setup_channel(options={}, connection)
+        channel = AMQP::Channel.new(connection)
+        channel.auto_recovery = true
+        channel.on_error do |channel, channel_close|
           error = Error.new("rabbitmq channel error")
           @on_error.call(error)
         end
@@ -244,13 +264,16 @@ module Sensu
         if options.is_a?(Hash)
           prefetch = options.fetch(:prefetch, 1)
         end
-        @channel.prefetch(prefetch)
+        channel.prefetch(prefetch)
+        channel
       end
 
       def connect_with_eligible_options(&callback)
         next_connection_options do |options|
-          setup_connection(options, &callback)
-          setup_channel(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)
         end
       end
 

data/sensu-transport.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-transport"
-  spec.version       = "7.1.0"
+  spec.version       = "8.0.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: 7.1.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Sean Porter
@@ -30,7 +30,7 @@ cert_chain:
   jOeGyhtQa9j4FFmsEJDg59f5v/3hECXsa3Xuml3foaFHzX3Ya/YIyd2YFxvkFKIu
   GVbe7A3YdxzdkH2Es/Ym9twdxXaIDdXzj8sWhw==
   -----END CERTIFICATE-----
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine