elbping 0.0.11 → 0.0.12

data/lib/elbping/cli.rb

@@ -91,8 +91,9 @@ module ElbPing
       nameserver = OPTIONS[:nameserver]
       begin
         nodes = ElbPing::Resolver.find_elb_nodes elb_uri.host, nameserver
-      rescue
+      rescue StandardError => e
         ElbPing::Display.error "Unable to query DNS for #{elb_uri.host} using #{nameserver}"
+        ElbPing::Display.debug e
         exit(false)
       end
 
@@ -116,6 +117,8 @@ module ElbPing
         ##
         # Ping each node while tracking requests, responses, and latencies
         nodes.map { |node|
+          break if not run
+
           status = ElbPing::HttpPinger.ping_node(node,
             elb_uri.port,
             (elb_uri.path == "") ? "/" : elb_uri.path,

data/lib/elbping/display.rb

@@ -21,6 +21,17 @@ module ElbPing
       self.out "ERROR: #{msg}"
     end
 
+    # Print debug information to the screen
+    #
+    # Arguments:
+    # * exception: (Exception object)
+
+    def self.debug(exception)
+      if ENV["DEBUG"]
+        self.out "DEBUG: #{exception.backtrace}"
+      end
+    end
+
     # Format and display the ping data given a response
     #
     # Arguments:
@@ -46,7 +57,8 @@ module ElbPing
     # * stats: (ElbPing::Stats)
 
     def self.summary(stats)
-      stats.nodes.keys.each { |node|
+      pinged_nodes = stats.nodes.keys.select { |n| stats.nodes[n][:requests] > 0 }
+      pinged_nodes.each { |node|
         loss_pct = (stats.node_loss(node) * 100).to_i
         self.out "--- #{node} statistics ---"
         self.out "#{stats.nodes[node][:requests]} requests, #{stats.nodes[node][:responses]} responses, #{loss_pct}% loss"

data/lib/elbping/resolver.rb

@@ -1,40 +1,6 @@
 
 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 fetch_resource(name, typeclass)
-    lazy_initialize
-    request = make_tcp_requester
-    sends = {}
-    begin
-      @config.resolv(name) { |candidate, tout, 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
-        reply, reply_name = requester.request(sender, tout)
-        case reply.rcode
-        when RCode::NoError
-          yield(reply, reply_name)
-          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
-    end
-  end
-end
+require 'elbping/tcp_dns.rb'
 
 module ElbPing
   # Handles all DNS resolution and, more specifically, ELB node discovery
@@ -57,10 +23,12 @@ module ElbPing
       Timeout::timeout(timeout) do 
         TcpDNS.open :nameserver => nameservers, :search => '', :ndots => 1 do |dns|
           # TODO: Exceptions
-          resp = dns.getresources target, Resolv::DNS::Resource::IN::A
+          resp = dns.getresources target, Resolv::DNS::Resource::IN::ANY
         end
       end
-      resp.map { |r| r.address.to_s }
+      if resp
+        resp.select { |r| r.respond_to? "address" and r.address }.map { |r| r.address.to_s  }
+      end
     end
   end
 end

data/lib/elbping/stats.rb

@@ -1,19 +1,5 @@
 
-# TODO: Needs unit tests
-
-# An array for doing some basic stats on latencies (currently only mean)
-class LatencyBucket < Array
-  def sum
-    self.inject { |sum, el| sum + el} || 0
-  end
-
-  def mean
-    i = 0
-    unless self.size == 0
-      i = (self.sum.to_f / self.size).to_i
-    end
-  end
-end
+require 'elbping/latency_bucket.rb'
 
 module ElbPing
   # Tracks the statistics of requests sent, responses received (hence loss) and latency
@@ -102,4 +88,3 @@ module ElbPing
 
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elbping
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors: