elbping 0.0.15 → 0.0.16

data/elbping.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'elbping'
-  s.version       = '0.0.15'
+  s.version       = '0.0.16'
   s.date          = '2013-08-13'
   s.summary       = "Small tool to 'ping' the nodes that make up an Amazon Elastic Load Balancer"
   s.description   = "elbping is a tool to ping all of the nodes behind an Amazon Elastic Load Balancer. It only works for ELBs in HTTP mode and works by triggering an HTTP 405 (METHOD NOT ALLOWED) error caused when the ELB receives a HTTP verb that is too long."

data/lib/elbping/resolver.rb

@@ -1,5 +1,4 @@
 require 'resolv'
-require 'elbping/tcp_dns.rb'
 
 # TODO: Raise own exceptions
 
@@ -67,14 +66,17 @@ module ElbPing
         end
       end
 
-      nameservers = find_elb_ns target, timeout
+      # Resolv::DNS never completes queries successfully if you pass a list
+      # of nameservers to it
+      nameserver = find_elb_ns(target, timeout).sample
 
       Timeout::timeout(timeout) do
-        TcpDNS.open :nameserver => nameservers, :search => '', :ndots => 1 do |dns|
+        Resolv::DNS.open :nameserver => nameserver do |dns|
           # TODO: Exceptions
           resp = dns.getresources "all.#{target}", Resolv::DNS::Resource::IN::A
         end
       end
+
       if resp
         resp.select { |r| r.respond_to? "address" and r.address }.map { |r| r.address.to_s  }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elbping
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -52,7 +52,6 @@ files:
 - lib/elbping/pinger.rb
 - lib/elbping/resolver.rb
 - lib/elbping/stats.rb
-- lib/elbping/tcp_dns.rb
 - test/test_latencybucket.rb
 - test/test_pinger.rb
 - test/test_resolver.rb

data/lib/elbping/tcp_dns.rb

@@ -1,44 +0,0 @@
-
-require 'resolv'
-
-# A TCP-only resolver built from `Resolv::DNS`. See the docs for what it's about.
-# http://ruby-doc.org/stdlib-1.9.3/libdoc/resolv/rdoc/Resolv/DNS.html
-class TcpDNS < Resolv::DNS
-  # Override fetch_resource to use a TCP requester instead of a UDP requester. This
-  # is mostly borrowed from `lib/resolv.rb` with the UDP->TCP fallback logic removed.
-  def each_resource(name, typeclass, &proc)
-    lazy_initialize
-    senders = {}
-    requester = nil
-    begin
-      @config.resolv(name) { |candidate, tout, nameserver, port|
-        requester = make_tcp_requester(nameserver, port)
-        msg = Message.new
-        msg.rd = 1
-        msg.add_question(candidate, typeclass)
-        unless sender = senders[[candidate, nameserver, port]]
-          sender = senders[[candidate, nameserver, port]] =
-            requester.sender(msg, candidate, nameserver, port)
-        end
-
-        begin # HACK
-          reply, reply_name = requester.request(sender, tout)
-        rescue
-          return
-        end
-
-        case reply.rcode
-        when RCode::NoError
-          extract_resources(reply, reply_name, typeclass, &proc)
-          return
-        when RCode::NXDomain
-          raise Config::NXDomain.new(reply_name.to_s)
-        else
-          raise Config::OtherResolvError.new(reply_name.to_s)
-        end
-      }
-    ensure
-      requester.close unless requester.nil?
-    end
-  end
-end