elbping 0.0.4 → 0.0.5

data/lib/elbping/cli.rb

@@ -52,6 +52,22 @@ module ElbPing
     # Main entry point of the program
     def self.main
       PARSER.parse!(ARGV) rescue usage
+      run = true
+
+      # Set up summary objects
+      total_summary = {
+        :reqs_attempted =>  0,
+        :reqs_completed =>  0,
+        :latencies      => [],
+      }
+      node_summary = {}
+
+      # Catch ctrl-c
+      trap("SIGINT") {
+        #ElbPing::Display.summary(total_summary, node_summary)
+        #exit!
+        run = false
+      }
 
       if ARGV.size < 1
         usage
@@ -70,23 +86,10 @@ module ElbPing
         exit(false)
       end
 
-      # Set up summary objects
-      total_summary = {
-        :reqs_attempted =>  0,
-        :reqs_completed =>  0,
-        :latencies      => [],
-      }
-      node_summary = {}
       nodes.each { |node| node_summary[node] = total_summary.clone }
 
-      # Catch ctrl-c
-      trap("INT") {
-        ElbPing::Display.summary(total_summary, node_summary)
-        exit
-      }
-
       iteration = 0
-      while OPTIONS[:count] < 1 || iteration < OPTIONS[:count]
+      while (OPTIONS[:count] < 1 || iteration < OPTIONS[:count]) && run
         sleep OPTIONS[:wait] if iteration > 0
 
         nodes.map { |node|

data/lib/elbping/display.rb

@@ -6,8 +6,10 @@ module ElbPing
       node = status[:node]
       code = status[:code]
       duration = status[:duration]
+      exc = status[:exception]
+      exc_display = exc ? 'exception=#{exception}' : ''
 
-      puts "Response from #{node}: code=#{code.to_s} time=#{duration} ms"
+      puts "Response from #{node}: code=#{code.to_s} time=#{duration} ms #{exc_display}"
     end
 
     # Display summary of results (in aggregate and per-node)
@@ -17,7 +19,11 @@ module ElbPing
       loss = (1 - (responses.to_f/requests)) * 100
 
       latencies = total_summary[:latencies]
-      avg_latency = (latencies.inject { |sum, el| sum + el }.to_f / latencies.size).to_i # ms
+      avg_latency = 0
+      unless latencies.size == 0
+        sum_latency = latencies.inject { |sum, el| sum + el} || 0
+        avg_latency = (sum_latency.to_f / latencies.size).to_i # ms
+      end
 
       node_summary.each { |node, summary|
         requests = summary[:reqs_attempted]
@@ -25,7 +31,11 @@ module ElbPing
         loss = (1 - (responses.to_f/requests)) * 100
 
         latencies = summary[:latencies]
-        avg_latency = (latencies.inject { |sum, el| sum + el }.to_f / latencies.size).to_i # ms
+        avg_latency = 0
+        unless latencies.size == 0
+          sum_latency = latencies.inject { |sum, el| sum + el} || 0
+          avg_latency = (sum_latency.to_f / latencies.size).to_i # ms
+        end
 
         puts "--- #{node} statistics ---"
         puts "#{requests} requests, #{responses} responses, #{loss.to_i}% loss"

data/lib/elbping/pinger.rb

@@ -20,9 +20,20 @@ module ElbPing
       http.ssl_timeout      = timeout # untested
 
       error = nil
-      response = http.request(ping_request.new(path)) rescue error = :timeout
+      exc = nil
+      begin
+        response = http.request(ping_request.new(path))
+      rescue Errno::ECONNREFUSED
+        error = :econnrefused
+      rescue Timeout::Error
+        error = :timeout
+      rescue StandardError => e
+        exc = e # because I don't understand scope in ruby yet
+        error = :exception
+      end
 
       {:code => error || response.code,
+        :exception => exc,
         :node => node,
         :duration => ((Time.now.getutc - start) * 1000).to_i} # returns in ms
     end

metadata

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