right_http_connection 1.2.0 → 1.2.1

data/History.txt

@@ -28,3 +28,15 @@ Initial public release
 * r1867, konstantin, 2007-10-05 06:19:45
   * # 220, (re)open connection to server if none exists or connection params 
     have changed 
+
+== 1.2.1
+
+* r2648, konstantin, 01-24-08 11:12:00
+  * net_fix.rb moved from right_aws gem to fix the problem with uploading the streamable
+    objects to S3
+
+* r2764, konstantin, 02-08-08 00:05:00 +03:00
+  * "RightAws: incompatible Net::HTTP monkey-patch" exception is raised if our net_fix
+    patch was overriden (by attachment_fu for example, to avoid this load attachment_fu 
+    before loading the right_http_connection gem).
+    

data/Manifest.txt

@@ -2,5 +2,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+lib/net_fix.rb
 lib/right_http_connection.rb
 setup.rb

data/README.txt

@@ -7,7 +7,7 @@ RightScale::HttpConnection
 Rightscale::HttpConnection is a robust HTTP/S library.  It implements a retry
 algorithm for low-level network errors.
 
-== FEATURES/PROBLEMS:
+== FEATURES:
 
 - provides put/get streaming
 - does configurable retries on connect and read timeouts, DNS failures, etc.
@@ -18,7 +18,13 @@ algorithm for low-level network errors.
 
 == REQUIREMENTS:
 
-None.
+- 2/11/08: If you use RightScale::HttpConnection in conjunction with attachment_fu, the
+  HttpConnection gem must be included (using the require statement) AFTER
+  attachment_fu.  
+  This is due to a conflict between the HttpConnection gem and another
+  gem required by attachment_fu.
+
+
 
 == INSTALL:
 
@@ -26,7 +32,7 @@ sudo gem install
 
 == LICENSE:
 
-Copyright (c) 2007 RightScale, Inc. 
+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

data/lib/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/right_http_connection.rb

@@ -1,5 +1,24 @@
 #
-# Copyright (c) 2007 RightScale Inc, all rights reserved
+# 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"
@@ -7,12 +26,15 @@ require "uri"
 require "time"
 require "logger"
 
+$:.unshift(File.dirname(__FILE__))
+require "net_fix"
+
 
 module RightHttpConnection #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
@@ -114,6 +136,34 @@ them.
       @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
     #--------------
     # Retry state - Keep track of errors on a per-server basis
@@ -292,18 +342,20 @@ them.
               # ... else just sleep a bit before new retry
             sleep(add_eof)
           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))
             @logger.debug( "#{err_header} request to server #{@server} interrupted by ctrl-c")
-            @http = nil
             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)
           @logger.warn("#{err_header} request failure count: #{error_count}, exception: #{e.inspect}")
-          @http = nil
         end
       end
     end
@@ -328,3 +380,4 @@ them.
   end
   
 end
+

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: right_http_connection
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2007-10-17 00:00:00 +04:00
+  version: 1.2.1
+date: 2008-02-11 00:00:00 -08:00
 summary: RightScale's robust HTTP/S connection module
 require_paths: 
 - lib
@@ -33,6 +33,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- lib/net_fix.rb
 - lib/right_http_connection.rb
 - setup.rb
 test_files: []