elbping 0.0.7 → 0.0.8

data/lib/elbping/cli.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'uri'
 
 require 'elbping/pinger.rb'
 require 'elbping/resolver.rb'
@@ -16,11 +17,10 @@ module ElbPing
     OPTIONS[:count]         = ENV['PING_ELB_PINGCOUNT']     || 0
     OPTIONS[:timeout]       = ENV['PING_ELB_TIMEOUT']       || 10
     OPTIONS[:wait]          = ENV['PING_ELB_WAIT']          || 0
-    OPTIONS[:port]          = ENV['PING_ELB_PORT']          || 80
 
     # Build parser for command line options
     PARSER = OptionParser.new do |opts|
-      opts.banner = "Usage: #{$0} [options] <elb hostname>"
+      opts.banner = "Usage: #{$0} [options] <elb uri>"
 
       opts.on("-N NAMESERVER", "--nameserver NAMESERVER",
         "Use NAMESERVER to perform DNS queries (default: #{OPTIONS[:nameserver]})") do |ns|
@@ -42,10 +42,6 @@ module ElbPing
         "Ping each node COUNT times (default: #{OPTIONS[:count]})") do |n|
         OPTIONS[:count] = n
       end
-      opts.on("-p PORT", "--port PORT", Integer,
-        "Port to send requests to (default: #{OPTIONS[:port]})") do |n|
-        OPTIONS[:port] = n
-      end
     end
 
     # Parse options
@@ -75,12 +71,18 @@ module ElbPing
       if ARGV.size < 1
         usage
       end
+      unless ARGV[0] =~ URI::regexp
+        puts "ERROR: ELB URI does not seem valid"
+        usage
+      end
+      elb_uri_s = ARGV[0]
+      elb_uri = URI.parse(elb_uri_s)
 
-      target = ARGV[0]
       begin
-        nodes = ElbPing::Resolver.find_elb_nodes(target, OPTIONS[:nameserver])
+        nodes = ElbPing::Resolver.find_elb_nodes(elb_uri.host,
+          OPTIONS[:nameserver])
       rescue
-        puts "Error querying DNS for #{target} (NS: #{OPTIONS[:nameserver]})"
+        puts "Error querying DNS for #{elb_uri.host} (NS: #{OPTIONS[:nameserver]})"
         exit(false)
       end
 
@@ -98,8 +100,12 @@ module ElbPing
         nodes.map { |node|
           total_summary[:reqs_attempted] += 1
           node_summary[node][:reqs_attempted] += 1
+
           status = ElbPing::HttpPinger.ping_node(node,
-            OPTIONS[:verb_len], OPTIONS[:timeout], OPTIONS[:port])
+            elb_uri.port,
+            (elb_uri.path == "") ? "/" : elb_uri.path,
+            (elb_uri.scheme == 'https'),
+            OPTIONS[:verb_len], OPTIONS[:timeout])
 
           unless status[:code] == :timeout
             total_summary[:reqs_completed] += 1

data/lib/elbping/pinger.rb

@@ -1,23 +1,30 @@
 
 require "net/http"
+require "net/https"
 
 module ElbPing
   module HttpPinger
     # Make HTTP request to given node using custom request method
-    def self.ping_node(node, verb_len, timeout, port=80, path="/")
-
+    def self.ping_node(node, port, path, use_ssl, verb_len, timeout)
+      # Build request class
       ping_request = Class.new(Net::HTTPRequest) do
         const_set :METHOD, "A" * verb_len
         const_set :REQUEST_HAS_BODY, false
         const_set :RESPONSE_HAS_BODY, false
       end
 
+      # Configure http object
       start = Time.now.getutc
       http = Net::HTTP.new(node, port.to_s)
       http.open_timeout     = timeout
       http.read_timeout     = timeout
       http.continue_timeout = timeout
-      http.ssl_timeout      = timeout # untested
+
+      if use_ssl
+        http.use_ssl          = true
+        http.verify_mode      = OpenSSL::SSL::VERIFY_NONE
+        http.ssl_timeout      = timeout
+      end
 
       error = nil
       exc = nil

metadata

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