tribune-is_it_working 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b22be9cda692ebefffa0f9af6877afa972d1dbbc83d12d202163767c9d360dd4
-  data.tar.gz: e61c1188e1061ccd69ea3c83eb036d83fa9184b61058bd293a49ac07022f4ebf
+  metadata.gz: 19f29788c1d9cfd03068ba09dd7c35495a583978bb2f7dd87d4914ca14d63261
+  data.tar.gz: 93e288834b180ca0826b12643192d3177e71d08742e15fc9a651c2ad7bc53ba7
 SHA512:
-  metadata.gz: affa26c31930fe117b92e37e07c8265eadadcbb8685f3c74bfb1fe00d53197c82cf035cc9665fce0d9959069dcd0293142830f72df2537ad5c5cabd97dc83d5e
-  data.tar.gz: 6b3ed70ced13c6b0f92b8a5c40f60d6cb031d68f50bdc6b3f429659e26e336364933dcb01e26e66819f03f972055d8493202de179c9d595c7ce10edab5436120
+  metadata.gz: 2bded01d7f39448874cce85f243647387cf227825d4d6cfa1f086e835e649debfa07c3b73f3d445da1ee01215ca4bd4aabc7b7fe514b6dd07f89e6453a371eec
+  data.tar.gz: bb8a754c454eb6c3b7123f585c90886de536eb7b8e0fb6a12b024b6118f54614711fccd331b79a86541c6b599af10e7082a1cc9b7cd8b3a51444535c197e1abf

data/lib/is_it_working/checks/url_check.rb

@@ -8,6 +8,8 @@ module IsItWorking
   # Available options are:
   #
   # * <tt>:get</tt> - The URL to get.
+  # * <tt>:post</tt> - The URL to post.
+  # * <tt>:payload</tt> - Request body parameters.
   # * <tt>:headers</tt> - Hash of headers to send with the request
   # * <tt>:proxy</tt> - Hash of proxy server information. The hash must contain a <tt>:host</tt> key and may contain <tt>:port</tt>, <tt>:username</tt>, and <tt>:password</tt>
   # * <tt>:username</tt> - Username to use for Basic Authentication
@@ -15,7 +17,7 @@ module IsItWorking
   # * <tt>:open_timeout</tt> - Time in seconds to wait for opening the connection (defaults to 5 seconds)
   # * <tt>:read_timeout</tt> - Time in seconds to wait for data from the connection (defaults to 10 seconds)
   # * <tt>:alias</tt> - Alias used for reporting in case making the URL known to the world could provide a security risk.
-  #
+  # * <tt>:follow_redirect</tt> - Follow 302 redirect or not (defaults to true)
   # === Example
   #
   #   IsItWorking::Handler.new do |h|
@@ -23,7 +25,11 @@ module IsItWorking
   #     h.check :url, :post => "http://services.example.com/api",:headers => {"Content-Type" => "application/json"}
   #   end
   class UrlCheck
-    attr_accessor :request_method
+
+    attr_reader :request_method, :request_payload
+    # Follow 302 redirect or not, default is true
+    attr_reader :follow_redirect
+
     def initialize(options={})
       # TODO: Add support for PUT, DELETE & PATCH request methods
       raise ArgumentError.new(":get|:post must provide the URL to check") unless options[:get] || options[:post]
@@ -35,6 +41,8 @@ module IsItWorking
                         else
                           :get # fallback
                         end
+      @request_payload = options[:payload]
+      @follow_redirect = options[:follow_redirect].nil? ? true : options[:follow_redirect]
       @uri = URI.parse(options[request_method])
       @headers = options[:headers] || {}
       @proxy = options[:proxy]
@@ -48,8 +56,12 @@ module IsItWorking
     def call(status)
       t = Time.now
       response = perform_http_request
+      ok_msg = "#{request_method.upcase} #{@alias} responded with response '#{response.code} #{response.message}'"
       if response.is_a?(Net::HTTPSuccess)
-        status.ok("#{request_method.upcase} #{@alias} responded with response '#{response.code} #{response.message}'")
+        status.ok(ok_msg)
+      # 200 ok for 302 unless follow_redirect
+      elsif response.is_a?(Net::HTTPRedirection) && !follow_redirect
+        status.ok(ok_msg)
       else
         status.fail("#{request_method.upcase} #{@alias} failed with response '#{response.code} #{response.message}'")
       end
@@ -84,6 +96,8 @@ module IsItWorking
         case request_method
         when :post
           request = Net::HTTP::Post.new(@uri.request_uri, @headers)
+          # Assign request_payload to body if it present
+          request.body = request_payload.to_json unless request_payload.blank?
         else
           request = Net::HTTP::Get.new(@uri.request_uri, @headers)
         end

data/lib/is_it_working/handler.rb

@@ -163,15 +163,13 @@ module IsItWorking
       # Seperate method for rendeing/returning JSON
       def render_json(statuses, elapsed_time) #:nodoc:
         fail = statuses.all?{|s| s.success?}
-        messages = []
         components = []
         total_fail_count = 0
         statuses.each do |status|
           status.messages.each do |m|
-            messages << "#{m.ok? ? 'OK:  ' : 'FAIL:'} #{status.name} - #{m.message} (#{status.time ? sprintf('%0.000f', status.time * 1000) : '?'}ms)"
             message = { name: status.name,
                         component_name: status.component_name,
-                       info: "#{m.message} (#{status.time ? sprintf('%0.000f', status.time * 1000) : '?'}ms",
+                       info: "#{m.message} (#{status.time ? sprintf('%0.000f', status.time * 1000) : '?'}ms)",
                        time: status.time,
                        success: m.ok? ? true : false,
                        description: status.description }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tribune-is_it_working
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brian Durand