sensu-transport 6.0.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ba806650db7e6211a83b2040a4260ac820c8aea
-  data.tar.gz: e5bce79221bc9c26b3e1ec71b62a79f735c1c22b
+  metadata.gz: c4f60d201d69a505cbadc8730f1303997608a15a
+  data.tar.gz: 74ef946054dea6c1c7a8df3df623efb08100a6d3
 SHA512:
-  metadata.gz: 39af5f193e627206dc98e7bba305ca8251c9773933bd55dee2625709593e9601c388a83fc52f067dfb326381810c82d9649231cfff08a307177d90e53f071747
-  data.tar.gz: 2bd0a84d1ede40661f886570fa7a27c76bcb45553dba4d1412c79df1ab547dde7540d0fb5c7e4655931cabfda211ed550dc58dba9ac828ef1237b5b62b64f8ae
+  metadata.gz: b3726aa45930ae5562e476bc376ea003ee8bf5ec31e87a8da8d331907175a20875637b1fb748b9b77623c7dff6f6aa07582de23bee941aed580a9e57f1f7348a
+  data.tar.gz: 5e748dd5d6ce62e622a3f255977407ba2f0c31b5126d921ea173a87c00933f7ca77b87cac53a4b619ba47341e054dd07a798ac5aee0f5a2235bd6935241499a4

data/lib/sensu/transport/base.rb

@@ -1,4 +1,6 @@
 require "eventmachine"
+require "ipaddr"
+require "socket"
 
 module Sensu
   module Transport
@@ -134,6 +136,65 @@ module Sensu
         yield(info) if block_given?
       end
 
+      # Determine if a host is an IP address (or DNS hostname).
+      #
+      # @param host [String]
+      # @return [TrueClass, FalseClass]
+      def ip_address?(host)
+        begin
+          ip_address = IPAddr.new(host)
+          ip_address.ipv4? || ip_address.ipv6?
+        rescue IPAddr::InvalidAddressError
+          false
+        end
+      end
+
+      # Resolve a hostname to an IP address for a host. This method
+      # will return `nil` to the provided callback when the hostname
+      # cannot be resolved to an IP address.
+      #
+      # @param host [String]
+      # @param callback [Proc] called with the result of the DNS
+      #   query (IP address).
+      def resolve_hostname(host, &callback)
+        resolve = Proc.new do
+          begin
+            info = case RUBY_PLATFORM
+            when /linux/
+              flags = Socket::AI_NUMERICSERV | Socket::AI_ADDRCONFIG
+              Socket.getaddrinfo(host, nil, Socket::AF_UNSPEC, nil, nil, flags)
+            else
+              Socket.getaddrinfo(host, nil)
+            end
+            info.first.nil? ? nil : info.first[2]
+          rescue => error
+            @logger.error("transport connection error", {
+              :reason => "unable to resolve hostname",
+              :error => error.to_s
+            }) if @logger
+            nil
+          end
+        end
+        EM.defer(resolve, callback)
+      end
+
+      # Resolve a hostname to an IP address for a host. This method
+      # will return the provided host to the provided callback if it
+      # is already an IP address. This method will return `nil` to the
+      # provided callback when the hostname cannot be resolved to an
+      # IP address.
+      #
+      # @param host [String]
+      # @param callback [Proc] called with the result of the DNS
+      #   query (IP address).
+      def resolve_host(host, &callback)
+        if ip_address?(host)
+          yield host
+        else
+          resolve_hostname(host, &callback)
+        end
+      end
+
       # Discover available transports (Subclasses)
       def self.descendants
         ObjectSpace.each_object(Class).select do |klass|

data/lib/sensu/transport/rabbitmq.rb

@@ -26,6 +26,7 @@ module Sensu
       def reconnect(force=false)
         unless @reconnecting
           @reconnecting = true
+          @logger.debug("transport reconnecting...")
           @before_reconnect.call
           reset
           periodically_reconnect
@@ -57,11 +58,16 @@ module Sensu
       #   callback/block.
       # @yieldparam info [Hash] contains publish information.
       def publish(type, pipe, message, options={})
-        catch_errors do
-          @channel.method(type.to_sym).call(pipe, options).publish(message) do
-            info = {}
-            yield(info) if block_given?
+        if connected?
+          catch_errors do
+            @channel.method(type.to_sym).call(pipe, options).publish(message) do
+              info = {}
+              yield(info) if block_given?
+            end
           end
+        else
+          info = {:error => "Transport is not connected"}
+          yield(info) if block_given?
         end
       end
 
@@ -176,27 +182,57 @@ module Sensu
         end
       end
 
-      def next_connection_options
+      def next_connection_options(&callback)
         if @eligible_options.nil? || @eligible_options.empty?
           @eligible_options = @connection_options.shuffle
         end
-        @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?
+              EM::Timer.new(3) do
+                next_connection_options(&callback)
+              end
+            else
+              yield options.merge(:host => ip_address)
+            end
+          end
+        else
+          yield options
+        end
       end
 
       def setup_connection(options={})
         reconnect_callback = Proc.new { reconnect }
+        on_possible_auth_failure = Proc.new {
+          @logger.warn("transport connection error", {
+            :reason => "possible authentication failure. wrong credentials?",
+            :user => options[:user]
+          })
+          reconnect
+        }
         @connection = AMQP.connect(options, {
           :on_tcp_connection_failure => reconnect_callback,
-          :on_possible_authentication_failure => reconnect_callback
+          :on_possible_authentication_failure => on_possible_auth_failure
         })
         @connection.logger = @logger
         @connection.on_open do
+          @logger.debug("transport connection open")
           @connection_timeout.cancel
           succeed
           yield if block_given?
         end
-        @connection.on_tcp_connection_loss(&reconnect_callback)
-        @connection.on_skipped_heartbeats(&reconnect_callback)
+        @connection.on_tcp_connection_loss do
+          @logger.warn("transport connection error", :reason => "tcp connection lost")
+          reconnect
+        end
+        @connection.on_skipped_heartbeats do
+          @logger.warn("transport connection error", :reason => "skipped heartbeats")
+          reconnect
+        end
+        @connection.on_closed do
+          @logger.debug("transport connection closed")
+        end
       end
 
       def setup_channel(options={})
@@ -214,9 +250,10 @@ module Sensu
       end
 
       def connect_with_eligible_options(&callback)
-        options = next_connection_options
-        setup_connection(options, &callback)
-        setup_channel(options)
+        next_connection_options do |options|
+          setup_connection(options, &callback)
+          setup_channel(options)
+        end
       end
 
       def periodically_reconnect(delay=2)

data/sensu-transport.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-transport"
-  spec.version       = "6.0.1"
+  spec.version       = "7.0.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu transport abstraction library"
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "codeclimate-test-reporter" unless RUBY_VERSION < "1.9"
+  spec.add_development_dependency "sensu-logger"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-transport
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sensu-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The Sensu transport abstraction library
 email:
 - portertech@gmail.com