ahoward-helene 0.0.3

data/lib/helene/rightscale/net_fix.rb

@@ -0,0 +1,160 @@
+#
+# Copyright (c) 2008 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+#
+
+# Net::HTTP and Net::HTTPGenericRequest fixes to support 100-continue on 
+# POST and PUT. The request must have 'expect' field set to '100-continue'.
+
+
+module Net
+  
+  class BufferedIO #:nodoc:
+    # Monkey-patch Net::BufferedIO to read > 1024 bytes from the socket at a time
+
+    # Default size (in bytes) of the max read from a socket into the user space read buffers for socket IO
+    DEFAULT_SOCKET_READ_SIZE = 16*1024
+
+    @@socket_read_size = DEFAULT_SOCKET_READ_SIZE
+
+    def self.socket_read_size=(readsize)
+      if(readsize <= 0)
+        return
+      end
+      @@socket_read_size = readsize
+    end
+
+    def self.socket_read_size?()
+      @@socket_read_size
+    end
+
+    def rbuf_fill
+      timeout(@read_timeout) {
+        @rbuf << @io.sysread(@@socket_read_size)
+      }
+    end
+  end
+
+
+  #-- Net::HTTPGenericRequest --
+
+  class HTTPGenericRequest
+    # Monkey-patch Net::HTTPGenericRequest to read > 1024 bytes from the local data
+    # source at a time (used in streaming PUTs)
+
+    # Default size (in bytes) of the max read from a local source (File, String,
+    # etc.) to the user space write buffers for socket IO.
+    DEFAULT_LOCAL_READ_SIZE = 16*1024
+
+    @@local_read_size = DEFAULT_LOCAL_READ_SIZE
+
+    def self.local_read_size=(readsize)
+      if(readsize <= 0)
+        return
+      end
+      @@local_read_size = readsize
+    end
+
+    def self.local_read_size?()
+      @@local_read_size
+    end
+
+    def exec(sock, ver, path, send_only=nil)   #:nodoc: internal use only
+      if @body
+        send_request_with_body sock, ver, path, @body, send_only
+      elsif @body_stream
+        send_request_with_body_stream sock, ver, path, @body_stream, send_only
+      else
+        write_header(sock, ver, path)
+      end
+    end
+
+    private
+
+    def send_request_with_body(sock, ver, path, body, send_only=nil)
+      self.content_length = body.length
+      delete 'Transfer-Encoding'
+      supply_default_content_type
+      write_header(sock, ver, path) unless send_only == :body
+      sock.write(body)              unless send_only == :header
+    end
+
+    def send_request_with_body_stream(sock, ver, path, f, send_only=nil)
+      unless content_length() or chunked?
+        raise ArgumentError,
+            "Content-Length not given and Transfer-Encoding is not `chunked'"
+      end
+      supply_default_content_type
+      write_header(sock, ver, path) unless send_only == :body
+      unless send_only == :header
+        if chunked?
+          while s = f.read(@@local_read_size)
+            sock.write(sprintf("%x\r\n", s.length) << s << "\r\n")
+          end
+          sock.write "0\r\n\r\n"
+        else
+          while s = f.read(@@local_read_size)
+            sock.write s
+          end
+        end
+      end
+    end    
+  end
+
+
+  #-- Net::HTTP --
+  
+  class HTTP
+    def request(req, body = nil, &block)  # :yield: +response+
+      unless started?
+        start {
+          req['connection'] ||= 'close'
+          return request(req, body, &block)
+        }
+      end
+      if proxy_user()
+        unless use_ssl?
+          req.proxy_basic_auth proxy_user(), proxy_pass()
+        end
+      end
+      # set body
+      req.set_body_internal body
+      begin_transport req
+        # if we expect 100-continue then send a header first
+        send_only = ((req.is_a?(Post)||req.is_a?(Put)) && (req['expect']=='100-continue')) ? :header : nil
+        req.exec @socket, @curr_http_version, edit_path(req.path), send_only
+        begin
+          res = HTTPResponse.read_new(@socket)
+          # if we expected 100-continue then send a body
+          if res.is_a?(HTTPContinue) && send_only && req['content-length'].to_i > 0
+            req.exec @socket, @curr_http_version, edit_path(req.path), :body
+          end
+        end while res.kind_of?(HTTPContinue)
+        res.reading_body(@socket, req.response_body_permitted?) {
+          yield res if block_given?
+        }
+      end_transport req, res
+      res
+    end
+  end
+
+end

data/lib/helene/rightscale/right_aws.rb

@@ -0,0 +1,71 @@
+#
+# Copyright (c) 2007-2008 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+require 'benchmark'
+require 'net/https'
+require 'uri'
+require 'time'
+require "cgi"
+require "base64"
+require "rexml/document"
+require "openssl"
+require "digest/sha1"
+
+require 'rubygems'
+require 'right_http_connection'
+
+$:.unshift(File.dirname(__FILE__))
+require 'awsbase/benchmark_fix'
+require 'awsbase/support'
+require 'awsbase/right_awsbase'
+require 'ec2/right_ec2'
+require 's3/right_s3_interface'
+require 's3/right_s3'
+require 'sqs/right_sqs_interface'
+require 'sqs/right_sqs'
+require 'sqs/right_sqs_gen2_interface'
+require 'sqs/right_sqs_gen2'
+require 'sdb/right_sdb_interface'
+require 'acf/right_acf_interface'
+
+
+
+module RightAws #:nodoc:
+  module VERSION #:nodoc:
+    RightAws::VERSION::MAJOR = 1 unless defined?(RightAws::VERSION::MAJOR)
+    RightAws::VERSION::MINOR = 10 unless defined?(RightAws::VERSION::MINOR)
+    RightAws::VERSION::TINY  = 0 unless defined?(RightAws::VERSION::TINY)
+    STRING = [MAJOR, MINOR, TINY].join('.') unless defined?(RightAws::VERSION::STRING)
+  end
+end
+
+__END__
+
+#-
+
+# We also want everything available in the Rightscale namespace for backward
+# compatibility reasons.
+module Rightscale #:nodoc:
+  include RightAws
+  extend RightAws
+end

data/lib/helene/rightscale/right_http_connection.rb

@@ -0,0 +1,507 @@
+#
+# Copyright (c) 2007-2008 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+require "net/https"
+require "uri"
+require "time"
+require "logger"
+
+$:.unshift(File.dirname(__FILE__))
+require "net_fix"
+
+
+module RightHttpConnection #:nodoc:
+  unless defined?(RightHttpConnection::VERSION)
+    module VERSION #:nodoc:
+      MAJOR = 1
+      MINOR = 2
+      TINY  = 4
+
+      STRING = [MAJOR, MINOR, TINY].join('.')
+    end
+  end
+end
+
+
+module Rightscale
+
+=begin rdoc
+HttpConnection maintains a persistent HTTP connection to a remote
+server.  Each instance maintains its own unique connection to the
+HTTP server.  HttpConnection makes a best effort to receive a proper
+HTTP response from the server, although it does not guarantee that
+this response contains a HTTP Success code.
+
+On low-level errors (TCP/IP errors) HttpConnection invokes a reconnect
+and retry algorithm.  Note that although each HttpConnection object
+has its own connection to the HTTP server, error handling is shared
+across all connections to a server.  For example, if there are three
+connections to www.somehttpserver.com, a timeout error on one of those
+connections will cause all three connections to break and reconnect.
+A connection will not break and reconnect, however, unless a request
+becomes active on it within a certain amount of time after the error
+(as specified by HTTP_CONNECTION_RETRY_DELAY).  An idle connection will not
+break even if other connections to the same server experience errors.
+
+A HttpConnection will retry a request a certain number of times (as
+defined by HTTP_CONNNECTION_RETRY_COUNT).  If all the retries fail,
+an exception is thrown and all HttpConnections associated with a
+server enter a probationary period defined by HTTP_CONNECTION_RETRY_DELAY.
+If the user makes a new request subsequent to entering probation,
+the request will fail immediately with the same exception thrown
+on probation entry.  This is so that if the HTTP server has gone
+down, not every subsequent request must wait for a connect timeout
+before failing.  After the probation period expires, the internal
+state of the HttpConnection is reset and subsequent requests have
+the full number of potential reconnects and retries available to
+them.
+=end
+
+  class HttpConnection
+
+    # Number of times to retry the request after encountering the first error
+    unless defined?(HTTP_CONNECTION_RETRY_COUNT)
+      HTTP_CONNECTION_RETRY_COUNT   = 42  # up the 3
+    end
+    # Throw a Timeout::Error if a connection isn't established within this number of seconds
+    unless defined?(HTTP_CONNECTION_OPEN_TIMEOUT)
+      HTTP_CONNECTION_OPEN_TIMEOUT  = 5
+    end
+    # Throw a Timeout::Error if no data have been read on this connnection within this number of seconds
+    unless defined?(HTTP_CONNECTION_READ_TIMEOUT)
+      HTTP_CONNECTION_READ_TIMEOUT  = 120
+    end
+    # Length of the post-error probationary period during which all requests will fail
+    unless defined?(HTTP_CONNECTION_RETRY_DELAY)
+      HTTP_CONNECTION_RETRY_DELAY   = 15
+    end
+
+    #--------------------
+    # class methods
+    #--------------------
+    #
+    @@params = {}
+    @@params[:http_connection_retry_count]  = HTTP_CONNECTION_RETRY_COUNT
+    @@params[:http_connection_open_timeout] = HTTP_CONNECTION_OPEN_TIMEOUT
+    @@params[:http_connection_read_timeout] = HTTP_CONNECTION_READ_TIMEOUT
+    @@params[:http_connection_retry_delay]  = HTTP_CONNECTION_RETRY_DELAY
+
+    # Query the global (class-level) parameters:
+    #
+    #  :user_agent => 'www.HostName.com'    # String to report as HTTP User agent
+    #  :ca_file    => 'path_to_file'        # Path to a CA certification file in PEM format. The file can contain several CA certificates.  If this parameter isn't set, HTTPS certs won't be verified.
+    #  :logger     => Logger object         # If omitted, HttpConnection logs to STDOUT
+    #  :exception  => Exception to raise    # The type of exception to raise
+    #                                       # if a request repeatedly fails. RuntimeError is raised if this parameter is omitted.
+    #  :http_connection_retry_count         # by default == Rightscale::HttpConnection::HTTP_CONNECTION_RETRY_COUNT
+    #  :http_connection_open_timeout        # by default == Rightscale::HttpConnection::HTTP_CONNECTION_OPEN_TIMEOUT
+    #  :http_connection_read_timeout        # by default == Rightscale::HttpConnection::HTTP_CONNECTION_READ_TIMEOUT
+    #  :http_connection_retry_delay         # by default == Rightscale::HttpConnection::HTTP_CONNECTION_RETRY_DELAY
+    def self.params
+      @@params
+    end
+
+    # Set the global (class-level) parameters
+    def self.params=(params)
+      @@params = params
+    end
+
+    module NullLogger
+      def respond_to?(*a, &b) true end
+      def method_missing(m, *a, &b) end
+      extend self
+    end
+
+    #------------------
+    # instance methods
+    #------------------
+    attr_accessor :http
+    attr_accessor :server
+    attr_accessor :params      # see @@params
+    attr_accessor :logger
+    attr_accessor :thread
+    attr_accessor :state
+    attr_accessor :eof
+
+     # Params hash:
+     #  :user_agent => 'www.HostName.com'    # String to report as HTTP User agent
+     #  :ca_file    => 'path_to_file'        # A path of a CA certification file in PEM format. The file can contain several CA certificates.
+     #  :logger     => Logger object         # If omitted, HttpConnection logs to STDOUT
+     #  :exception  => Exception to raise    # The type of exception to raise if a request repeatedly fails. RuntimeError is raised if this parameter is omitted.
+     #  :http_connection_retry_count         # by default == Rightscale::HttpConnection.params[:http_connection_retry_count]
+     #  :http_connection_open_timeout        # by default == Rightscale::HttpConnection.params[:http_connection_open_timeout]
+     #  :http_connection_read_timeout        # by default == Rightscale::HttpConnection.params[:http_connection_read_timeout]
+     #  :http_connection_retry_delay         # by default == Rightscale::HttpConnection.params[:http_connection_retry_delay]
+     #
+    def initialize(params={})
+      @thread = Thread.current
+      @caller = caller
+      @params = params
+      @params[:http_connection_retry_count]  ||= @@params[:http_connection_retry_count]
+      @params[:http_connection_open_timeout] ||= @@params[:http_connection_open_timeout]
+      @params[:http_connection_read_timeout] ||= @@params[:http_connection_read_timeout]
+      @params[:http_connection_retry_delay]  ||= @@params[:http_connection_retry_delay]
+      @http   = nil
+      @server = nil
+      @logger = get_param(:logger)
+      @logger ||= RAILS_DEFAULT_LOGGER if defined?(RAILS_DEFAULT_LOGGER)
+      @logger ||= NullLogger
+      @ca_file = get_param(:ca_file)
+      @state = {}
+      @eof = {}
+    end
+
+    def log(*args, &block)
+      @logger.send(*args, &block) if @logger
+    end
+
+    def prevent_mt_use!
+      unless Thread.current==@thread
+        msg = <<-__
+        @thread : #{ @thread.inspect }
+        
+        @caller : #{ @caller.inspect }
+        
+        thread  : #{ Thread.current.inspect }
+        
+        caller  : #{ caller.inspect }
+        __
+        
+        raise ThreadError.new, msg
+      end
+    end
+
+    def get_param(name)
+      @params[name] || @@params[name]
+    end
+
+    # Query for the maximum size (in bytes) of a single read from the underlying
+    # socket.  For bulk transfer, especially over fast links, this is value is
+    # critical to performance.
+    def socket_read_size?
+      Net::BufferedIO.socket_read_size?
+    end
+
+    # Set the maximum size (in bytes) of a single read from the underlying
+    # socket.  For bulk transfer, especially over fast links, this is value is
+    # critical to performance.
+    def socket_read_size=(newsize)
+      Net::BufferedIO.socket_read_size=(newsize)
+    end
+
+    # Query for the maximum size (in bytes) of a single read from local data
+    # sources like files.  This is important, for example, in a streaming PUT of a
+    # large buffer.
+    def local_read_size?
+      Net::HTTPGenericRequest.local_read_size?
+    end
+
+    # Set the maximum size (in bytes) of a single read from local data
+    # sources like files.  This can be used to tune the performance of, for example,  a streaming PUT of a
+    # large buffer.
+    def local_read_size=(newsize)
+      Net::HTTPGenericRequest.local_read_size=(newsize)
+    end
+
+  private
+    # number of consecutive errors seen for server, 0 all is ok
+    def error_count
+      state[@server] ? state[@server][:count] : 0
+    end
+
+    # time of last error for server, nil if all is ok
+    def error_time
+      state[@server] && state[@server][:time]
+    end
+
+    # message for last error for server, "" if all is ok
+    def error_message
+      state[@server] ? state[@server][:message] : ""
+    end
+
+    # add an error for a server
+    def error_add(message)
+      state[@server] = { :count => error_count+1, :time => Time.now, :message => message }
+    end
+
+    # reset the error state for a server (i.e. a request succeeded)
+    def error_reset
+      state.delete(@server)
+    end
+
+    # Error message stuff...
+    def banana_message
+      return "#{@server} temporarily unavailable: (#{error_message})"
+    end
+
+    def err_header
+      return "#{self.class.name} :"
+    end
+
+      # Adds new EOF timestamp.
+      # Returns the number of seconds to wait before new conection retry:
+      #  0.5, 1, 2, 4, 8
+    def add_eof
+      (eof[@server] ||= []).unshift Time.now
+      0.25 * 2 ** eof[@server].size
+    end
+
+
+      # Returns true if we are receiving EOFs during last @params[:http_connection_retry_delay] seconds
+      # and there were no successful response from server
+    def raise_on_eof_exception?
+      eof[@server].blank? ? false : ( (Time.now.to_i-@params[:http_connection_retry_delay]) > eof[@server].last.to_i )
+    end
+
+    # Returns first EOF timestamp or nul if have no EOFs being tracked.
+    def eof_time
+      eof[@server] && eof[@server].last
+    end
+
+    # Reset a list of EOFs for this server.
+    # This is being called when we have got an successful response from server.
+    def eof_reset
+      eof.delete(@server)
+    end
+
+    # Detects if an object is 'streamable' - can we read from it, and can we know the size?
+    def setup_streaming(request)
+      if(request.body && request.body.respond_to?(:read))
+        body = request.body
+        request.content_length = body.respond_to?(:lstat) ? body.lstat.size : body.size
+        request.body_stream = request.body
+        true
+      end
+    end
+
+    def get_fileptr_offset(request_params)
+      request_params[:request].body.pos
+    rescue Exception => e
+      # Probably caught this because the body doesn't support the pos() method, like if it is a socket.
+      # Just return 0 and get on with life.
+      0
+    end
+
+    def reset_fileptr_offset(request, offset = 0)
+      if(request.body_stream && request.body_stream.respond_to?(:pos))
+        begin
+          request.body_stream.pos = offset
+        rescue Exception => e
+          log(:warn, "Failed file pointer reset; aborting HTTP retries. -- #{err_header} #{e.inspect}")
+          raise e
+        end
+      end
+    end
+
+    # Start a fresh connection. The object closes any existing connection and
+    # opens a new one.
+    def start(request_params)
+      # close the previous if exists
+      finish
+      # create new connection
+      @server   = request_params[:server]
+      @port     = request_params[:port]
+      @protocol = request_params[:protocol]
+
+      log(:info, "Opening new #{@protocol.upcase} connection to #@server:#@port")
+      @http = Net::HTTP.new(@server, @port)
+      @http.open_timeout = @params[:http_connection_open_timeout]
+      @http.read_timeout = @params[:http_connection_read_timeout]
+
+      if @protocol == 'https'
+        verifyCallbackProc = Proc.new{ |ok, x509_store_ctx|
+          code = x509_store_ctx.error
+          msg = x509_store_ctx.error_string
+            #debugger
+          log(:warn, "##### #{@server} certificate verify failed: #{msg}") unless code == 0
+          true
+        }
+        @http.use_ssl = true
+        ca_file = get_param(:ca_file)
+        if ca_file
+          #@http.verify_mode     = OpenSSL::SSL::VERIFY_PEER
+          @http.verify_mode     = OpenSSL::SSL::VERIFY_NONE
+          #@http.verify_callback = verifyCallbackProc
+          #@http.ca_file         = ca_file
+        end
+      end
+      # open connection
+      @http.start
+    end
+
+  public
+
+=begin rdoc
+    Send HTTP request to server
+
+     request_params hash:
+     :server   => 'www.HostName.com'   # Hostname or IP address of HTTP server
+     :port     => '80'                 # Port of HTTP server
+     :protocol => 'https'              # http and https are supported on any port
+     :request  => 'requeststring'      # Fully-formed HTTP request to make
+
+    Raises RuntimeError, Interrupt, and params[:exception] (if specified in new).
+
+=end
+    def request(request_params, &block)
+      # prevent_mt_use!
+      log_request(request_params) rescue nil
+      # We save the offset here so that if we need to retry, we can return the file pointer to its initial position
+      mypos = get_fileptr_offset(request_params)
+      loop do
+        # if we are inside a delay between retries: no requests this time!
+        if error_count > @params[:http_connection_retry_count] &&
+           error_time + @params[:http_connection_retry_delay] > Time.now
+          # store the message (otherwise it will be lost after error_reset and
+          # we will raise an exception with an empty text)
+          banana_message_text = banana_message
+          log(:warn, "#{err_header} re-raising same error: #{banana_message_text} " +
+                      "-- error count: #{error_count}, error age: #{Time.now.to_i - error_time.to_i}")
+          exception = get_param(:exception) || RuntimeError
+          raise exception.new(banana_message_text)
+        end
+
+        # try to connect server(if connection does not exist) and get response data
+        begin
+          request_params[:protocol] ||= (request_params[:port] == 443 ? 'https' : 'http')
+
+          request = request_params[:request]
+          request['User-Agent'] = get_param(:user_agent) || ''
+
+          # (re)open connection to server if none exists or params has changed
+          unless @http          &&
+                 @http.started? &&
+                 @server   == request_params[:server] &&
+                 @port     == request_params[:port]   &&
+                 @protocol == request_params[:protocol]
+            start(request_params)
+          end
+
+          # Detect if the body is a streamable object like a file or socket.  If so, stream that
+          # bad boy.
+          setup_streaming(request)
+          response = @http.request(request, &block)
+          log_response(response) rescue nil
+
+          error_reset
+          eof_reset
+          return response
+
+        # We treat EOF errors and the timeout/network errors differently.  Both
+        # are tracked in different statistics blocks.  Note below that EOF
+        # errors will sleep for a certain (exponentially increasing) period.
+        # Other errors don't sleep because there is already an inherent delay
+        # in them; connect and read timeouts (for example) have already
+        # 'slept'.  It is still not clear which way we should treat errors
+        # like RST and resolution failures.  For now, there is no additional
+        # delay for these errors although this may change in the future.
+
+        # EOFError means the server closed the connection on us.
+        rescue EOFError => e
+          log(:debug, "#{err_header} server #{@server} closed connection")
+          @http = nil
+
+            # if we have waited long enough - raise an exception...
+          if raise_on_eof_exception?
+            exception = get_param(:exception) || RuntimeError
+            log(:warn, "#{err_header} raising #{exception} due to permanent EOF being received from #{@server}, error age: #{Time.now.to_i - eof_time.to_i}")
+            raise exception.new("Permanent EOF is being received from #{@server}.")
+          else
+              # ... else just sleep a bit before new retry
+            sleep(add_eof)
+            # We will be retrying the request, so reset the file pointer
+            reset_fileptr_offset(request, mypos)
+          end
+        rescue Exception => e  # See comment at bottom for the list of errors seen...
+          @http = nil
+          # if ctrl+c is pressed - we have to reraise exception to terminate proggy
+          if e.is_a?(Interrupt) && !( e.is_a?(Errno::ETIMEDOUT) || e.is_a?(Timeout::Error))
+            log(:debug, "#{err_header} request to server #{@server} interrupted by ctrl-c")
+            raise
+          elsif e.is_a?(ArgumentError) && e.message.include?('wrong number of arguments (5 for 4)')
+            # seems our net_fix patch was overriden...
+            exception = get_param(:exception) || RuntimeError
+            raise exception.new('incompatible Net::HTTP monkey-patch')
+          end
+          # oops - we got a banana: log it
+          error_add(e.message)
+          log(:warn, "#{err_header} request failure count: #{error_count}, exception: #{e.inspect}")
+
+          # We will be retrying the request, so reset the file pointer
+          reset_fileptr_offset(request, mypos)
+
+        end
+      end
+    end
+
+    def log_request(request_params)
+      return if logger.nil?
+      return unless logger.debug?
+      logger.debug{ "HttpConnection - request_params=#{ request_params.inspect }" }
+      if((request = request_params[:request]))
+        method = request.method
+        path = request.path
+        #body = (request.body.size > 42 ? (request.body[0,42] + '...') : request.body) if request.body
+        body = request.body
+        logger.debug{ "HttpConnection - request.method=#{ method.inspect }" }
+        logger.debug{ "HttpConnection - request.path=#{ path.inspect }" }
+        logger.debug{ "HttpConnection - request.body=#{ body.inspect }" }
+      end
+    end
+
+    def log_response(response)
+      return if logger.nil?
+      return unless logger.debug?
+      if response
+        code = response.code
+        message = response.message
+        #body = (response.body.size > 42 ? (response.body[0,42] + '...') : response.body) if response.body
+        body = response.body
+        logger.debug{ "HttpConnection - response.code=#{ code.inspect }" }
+        logger.debug{ "HttpConnection - response.message=#{ message.inspect }" }
+        logger.debug{ "HttpConnection - response.body=#{ body.inspect }" }
+      end
+    end
+
+    def finish(reason = '')
+      # prevent_mt_use!
+      if @http && @http.started?
+        reason = ", reason: '#{reason}'" unless reason.blank?
+        log(:info, "Closing #{@http.use_ssl? ? 'HTTPS' : 'HTTP'} connection to #{@http.address}:#{@http.port}#{reason}")
+        @http.finish rescue nil  # it's possible for a Thread to reset this before we can finish it (so it wouldn't be started)
+      end
+    end
+
+  # Errors received during testing:
+  #
+  #  #<Timeout::Error: execution expired>
+  #  #<Errno::ETIMEDOUT: Connection timed out - connect(2)>
+  #  #<SocketError: getaddrinfo: Name or service not known>
+  #  #<SocketError: getaddrinfo: Temporary failure in name resolution>
+  #  #<EOFError: end of file reached>
+  #  #<Errno::ECONNRESET: Connection reset by peer>
+  #  #<OpenSSL::SSL::SSLError: SSL_write:: bad write retry>
+  end
+
+end
+