lib/voorhees/logging.rb @@ -1,3 +1,4 @@ +require "voorhees/logging" require "voorhees/config" require "voorhees/exceptions" require "voorhees/request" lib/voorhees.rb @@ -79,9 +79,10 @@ module Voorhees end def perform_actual_request - retries_left = retries + Voorhees.debug("Performing #{http_method} request for #{uri.to_s}") + begin retries_left -= 1 @@ -93,25 +94,27 @@ module Voorhees rescue Timeout::Error if retries_left >= 0 - Voorhees::Config.logger.debug("Retrying due to Timeout::Error (#{uri.to_s})") + Voorhees.debug("Retrying due to Timeout::Error (#{uri.to_s})") retry end + Voorhees.debug("Request failed due to Timeout::Error (#{uri.to_s})") raise Voorhees::TimeoutError.new rescue Errno::ECONNREFUSED if retries_left >= 0 - Voorhees::Config.logger.debug("Retrying due to Errno::ECONNREFUSED (#{uri.to_s})") + Voorhees.debug("Retrying due to Errno::ECONNREFUSED (#{uri.to_s})") sleep(1) retry end + Voorhees.debug("Request failed due to Errno::ECONREFUSED (#{uri.to_s})") raise Voorhees::UnavailableError.new end if response.is_a?(Net::HTTPNotFound) - Voorhees::Config.logger.error("Service Not Found (#{uri.to_s})") + Voorhees.debug("Request failed due to Net::HTTPNotFound (#{uri.to_s})") raise Voorhees::NotFoundError.new end @@ -129,6 +132,7 @@ module Voorhees def parse_response(response) Voorhees::Config[:response_class].new(JSON.parse(response.body), @caller_class, @hierarchy) rescue JSON::ParserError + Voorhees.debug("Parsing JSON failed.\nFirst 500 chars of body:\n#{response.body[0...500]}") raise Voorhees::ParseError end lib/voorhees/request.rb 57cecad0872fafc6e1d06cddf5266f68ff0c476f Richard Livsey richard@livsey.org http://github.com/rlivsey/voorhees/commit/e31767a3c6d17a76c7bd4daa7d0f12dd97bd8303 e31767a3c6d17a76c7bd4daa7d0f12dd97bd8303 2009-06-23T16:05:14-07:00 2009-06-23T16:05:14-07:00 added debugging to Voorhees::Request dd3c21ee8bc478a8d267a9f3c15fa194c78ec9bb Richard Livsey richard@livsey.org