persistent_http 1.0.3 → 1.0.4

data/History.md

@@ -1,6 +1,11 @@
 PersistentHttp Changelog
 ========================
 
+1.0.4
+
+ - Added option :pool_timeout which will raise a Timeout::Error if unable to checkout a connection
+   within this time.
+
 1.0.3
 
  - Allow option idle_timeout which will renew connection that haven't been used in this amount of time.

data/README.rdoc

@@ -34,6 +34,7 @@ returned.
       :name         => 'MyHTTPClient',
       :logger       => Rails.logger,
       :pool_size    => 10,
+      :pool_timeout => 5,
       :warn_timeout => 0.25,
       :force_retry  => true,
       :url          => 'https://www.example.com/echo/foo'  # equivalent to :use_ssl => true, :host => 'www.example.com', :default_path => '/echo/foo'

data/lib/persistent_http.rb

@@ -105,6 +105,9 @@ class PersistentHTTP
   # from everybody else's.
   attr_reader :name
 
+  ##
+  # Seconds to wait for an available connection before a Timeout::Error is raised
+  attr_accessor :pool_timeout
   ##
   # Seconds to wait until a connection is opened.  See Net::HTTP#open_timeout
   attr_accessor :open_timeout
@@ -178,6 +181,7 @@ class PersistentHTTP
     @idle_timeout    = options[:idle_timeout]    || 10
     @keep_alive      = options[:keep_alive]      || 30
     @logger          = options[:logger]
+    @pool_timeout    = options[:pool_timeout]
     @open_timeout    = options[:open_timeout]
     @pool_size       = options[:pool_size]       || 1
     @port            = options[:port]
@@ -231,6 +235,7 @@ class PersistentHTTP
 
     @pool = GenePool.new(:name         => name + '-' + connection_id,
                          :pool_size    => @pool_size,
+                         :timeout      => @pool_timeout,
                          :warn_timeout => @warn_timeout,
                          :idle_timeout => @idle_timeout,
                          :close_proc   => nil,

data/lib/persistent_http/faster.rb.sav

@@ -0,0 +1,36 @@
+require 'net/protocol'
+
+##
+# Aaron Patterson's monkeypatch (accepted into 1.9.1) to fix Net::HTTP's speed
+# problems.
+#
+# http://gist.github.com/251244
+
+class Net::BufferedIO #:nodoc:
+  alias :old_rbuf_fill :rbuf_fill
+
+  def rbuf_fill
+    if @io.respond_to? :read_nonblock then
+      begin
+        @rbuf << @io.read_nonblock(65536)
+      rescue Errno::EWOULDBLOCK => e
+        retry if IO.select [@io], nil, nil, @read_timeout
+        raise Timeout::Error, e.message
+      end
+    else # SSL sockets do not have read_nonblock
+      timeout @read_timeout do
+        @rbuf << @io.sysread(65536)
+      end
+    end
+  end
+end if RUBY_VERSION < '1.9'
+
+class Net::BufferedIO
+  def rbuf_fill
+    if IO.select [@io], [@io], nil, @read_timeout
+      @io.sysread BUFSIZE, @rbuf
+    else
+      raise Timeout::Error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: persistent_http
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gene_pool
-  requirement: &70307428283760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70307428283760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Persistent HTTP connections using a connection pool
 email:
 - bradpardee@gmail.com
@@ -30,6 +35,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/persistent_http/faster.rb
+- lib/persistent_http/faster.rb.sav
 - lib/persistent_http.rb
 - LICENSE
 - Rakefile
@@ -49,16 +55,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1575083792056882891
+      hash: -3430403703717422601
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3430403703717422601
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Persistent HTTP connections using a connection pool