persistent_http 1.0.4 → 1.0.5

data/History.md

@@ -1,6 +1,11 @@
 PersistentHttp Changelog
 ========================
 
+1.0.5
+
+ - Don't require 'net/https' in code.  JRuby 1.6.8 can have issues when 2 threads attempt to require it
+   at the same time.
+
 1.0.4
 
  - Added option :pool_timeout which will raise a Timeout::Error if unable to checkout a connection

data/lib/persistent_http.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/https'
 require 'persistent_http/faster'
 require 'uri'
 require 'gene_pool'
@@ -241,6 +242,7 @@ class PersistentHTTP
                          :close_proc   => nil,
                          :logger       => @logger) do
       begin
+        @logger.debug { "#{name}: Creating connection" } if @logger
         connection = Net::HTTP.new(*net_http_args)
         connection.set_debug_output @debug_output if @debug_output
         connection.open_timeout = @open_timeout if @open_timeout
@@ -249,6 +251,7 @@ class PersistentHTTP
         ssl connection if @use_ssl
 
         connection.start
+        @logger.debug { "#{name} #{connection}: Connection created" } if @logger
         connection
       rescue Errno::ECONNREFUSED
         raise Error, "connection refused: #{connection.address}:#{connection.port}"
@@ -442,7 +445,6 @@ class PersistentHTTP
   # Enables SSL on +connection+
 
   def ssl connection
-    require 'net/https'
     connection.use_ssl = true
 
     # suppress warning but allow override

metadata

@@ -1,32 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: persistent_http
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  prerelease:
+  version: 1.0.5
 platform: ruby
 authors:
 - Brad Pardee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gene_pool
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: &3246 !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  requirement: *3246
+  prerelease: false
+  type: :runtime
 description: Persistent HTTP connections using a connection pool
 email:
 - bradpardee@gmail.com
@@ -34,41 +29,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/persistent_http/faster.rb
-- lib/persistent_http/faster.rb.sav
 - lib/persistent_http.rb
+- lib/persistent_http/faster.rb
 - LICENSE
 - Rakefile
 - History.md
 - README.rdoc
 homepage: http://github.com/bpardee/persistent_http
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -3430403703717422601
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 2
+      version: '0'
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -3430403703717422601
+      hash: 2
+      version: '0'
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.9
+signing_key:
 specification_version: 3
 summary: Persistent HTTP connections using a connection pool
 test_files: []
+...

data/lib/persistent_http/faster.rb.sav

@@ -1,36 +0,0 @@
-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