elbping 0.0.2 → 0.0.3

data/lib/elbping/cli.rb

@@ -13,7 +13,7 @@ module ElbPing
     OPTIONS = {}
     OPTIONS[:verb_len]      = ENV['PING_ELB_MAXVERBLEN']    || 128
     OPTIONS[:nameserver]    = ENV['PING_ELB_NS']            || 'ns-941.amazon.com'
-    OPTIONS[:count]         = ENV['PING_ELB_PINGCOUNT']     || 4
+    OPTIONS[:count]         = ENV['PING_ELB_PINGCOUNT']     || 0
     OPTIONS[:timeout]       = ENV['PING_ELB_TIMEOUT']       || 10
     OPTIONS[:wait]          = ENV['PING_ELB_WAIT']          || 0
 
@@ -21,19 +21,24 @@ module ElbPing
     PARSER = OptionParser.new do |opts|
       opts.banner = "Usage: #{$0} [options] <elb hostname>"
 
-      opts.on("-N NAMESERVER", "--nameserver NAMESERVER", "Use NAMESERVER to perform DNS queries") do |ns|
+      opts.on("-N NAMESERVER", "--nameserver NAMESERVER",
+        "Use NAMESERVER to perform DNS queries (default: #{OPTIONS[:nameserver]})") do |ns|
         OPTIONS[:nameserver] = ns
       end
-      opts.on("-L LENGTH", "--verb-length LENGTH", Integer, "Use verb LENGTH characters long") do |n|
+      opts.on("-L LENGTH", "--verb-length LENGTH", Integer,
+        "Use verb LENGTH characters long (default: #{OPTIONS[:verb_len]})") do |n|
         OPTIONS[:verb_len] = n
       end
-      opts.on("-W SECONDS", "--timeout SECONDS", Integer, "Use timeout of SECONDS for HTTP requests") do |n|
+      opts.on("-W SECONDS", "--timeout SECONDS", Integer,
+        "Use timeout of SECONDS for HTTP requests (default: #{OPTIONS[:timeout]})") do |n|
         OPTIONS[:timeout] = n
       end
-      opts.on("-w SECONDS", "--wait SECONDS", Integer, "Wait SECONDS between pings (default: 0)") do |n|
+      opts.on("-w SECONDS", "--wait SECONDS", Integer,
+        "Wait SECONDS between pings (default: #{OPTIONS[:wait]})") do |n|
         OPTIONS[:wait] = n
       end
-      opts.on("-c COUNT", "--count COUNT", Integer, "Ping each node COUNT times") do |n|
+      opts.on("-c COUNT", "--count COUNT", Integer,
+        "Ping each node COUNT times (default: #{OPTIONS[:count]})") do |n|
         OPTIONS[:count] = n
       end
     end
@@ -53,7 +58,17 @@ module ElbPing
       end
 
       target = ARGV[0]
-      nodes = ElbPing::Resolver.find_elb_nodes(target, OPTIONS[:nameserver])
+      begin
+        nodes = ElbPing::Resolver.find_elb_nodes(target, OPTIONS[:nameserver])
+      rescue
+        puts "Error querying DNS for #{target} (NS: #{OPTIONS[:nameserver]})"
+        exit(false)
+      end
+
+      if nodes.size < 1
+        puts "Could not find any ELB nodes, no pings sent."
+        exit(false)
+      end
 
       # Set up summary objects
       total_summary = {
@@ -70,8 +85,9 @@ module ElbPing
         exit
       }
 
-      (1..OPTIONS[:count]).each { |i|
-        sleep OPTIONS[:wait] if i > 1
+      i = 0
+      while OPTIONS[:count] < 1 || i < OPTIONS[:count]
+        sleep OPTIONS[:wait] if i > 0
 
         nodes.map { |node|
           total_summary[:reqs_attempted] += 1
@@ -86,8 +102,9 @@ module ElbPing
           end
 
           ElbPing::Display.response(status)
+          i += 1
         }
-      }
+      end
       ElbPing::Display.summary(total_summary, node_summary)
     end
   end

metadata

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