elbping 0.0.8 → 0.0.9

data/lib/elbping/resolver.rb

@@ -1,21 +1,39 @@
 
 require 'net/dns'
+require 'ipaddress'
 
 module ElbPing
   module Resolver
-    # Resolve an ELB address to a list of node IPs
-    def self.find_elb_nodes(target, nameserver)
+    def self.resolve_ns(nameserver)
+      # Resolve nameserver IP (you can't just plug a hostname into Net::DNS::Resolve)
+      # Return an empty list if can't look up nameserver address
+      if IPAddress.valid? nameserver
+        ns_addrs = [nameserver]
+      else
+        begin
+          ns_addrs = Resolver(nameserver).answer.map { |rr| rr.address.to_s }
+        rescue
+          ns_addrs = []
+        end
+      end
+    end
 
-      # First resolve our nameserver IP
-      ns_addrs = Resolver(nameserver).answer.map { |rr| rr.address.to_s }
+    # Resolve an ELB address to a list of node IPs. Should always return a list
+    # as long as the server responded, even if it's empty.
+    def self.find_elb_nodes(target, nameserver)
+      ns_addrs = resolve_ns nameserver
 
       # Now resolve our ELB nodes
       resolver = Net::DNS::Resolver.new(
         :use_tcp => true,
         :nameservers => ns_addrs,
         :retry => 5)
-
-      resp = resolver.query(target, Net::DNS::ANY)
+      begin
+        resp = resolver.query(target, Net::DNS::ANY)
+      rescue ArgumentError
+        # For some reason this is raised on timeout
+        raise "Error querying DNS: Probably a timeout"
+      end
 
       nodes = []
       resp.each_address { |a| nodes += [a.to_s] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elbping
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.4
+- !ruby/object:Gem::Dependency
+  name: ipaddress
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 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