net-http-persistent 1.4 → 1.4.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.4.1 / 2010-10-13
+
+* Bug Fixes
+  * Don't finish the connection when we're retrying, reset it.  Patch by James
+    Tucker.
+
 === 1.4 / 2010-09-29
 
 * Minor Enhancements

data/lib/net/http/persistent.rb

@@ -37,7 +37,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent use are using
 
-  VERSION = '1.4'
+  VERSION = '1.4.1'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -370,13 +370,17 @@ class Net::HTTP::Persistent
       retry
     rescue IOError, EOFError, Timeout::Error,
            Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EPIPE => e
-      due_to = "(due to #{e.message} - #{e.class})"
-      message = error_message connection
 
-      finish connection
+      if retried or not idempotent? req
+        due_to = "(due to #{e.message} - #{e.class})"
+        message = error_message connection
+
+        finish connection
+
+        raise Error, "too many connection resets #{due_to} #{message}"
+      end
 
-      raise Error, "too many connection resets #{due_to} #{message}" if
-        retried or not idempotent? req
+      reset connection
 
       retried = true
       retry

data/test/test_net_http_persistent.rb

@@ -42,21 +42,32 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     end
   end
 
-  def basic_connection
-    c = Object.new
-    c.instance_variable_set :@finished, false
-    c.instance_variable_set :@reset,    false
-    c.instance_variable_set :@started,  false
-
-    def c.finish; @finished = true end
-    def c.reset; @reset = true end
-    def c.start; end
-
-    def c.req() @req; end
-    def c.reset?; @reset end
-    def c.started?; true end
-    def c.finished?; @finished end
+  class BasicConnection
+    attr_accessor :started, :finished, :address, :port
+    attr_reader :req
+    def initialize
+      @started, @finished = 0, 0
+      @address, @port = 'example.com', 80
+    end
+    def finish
+      @finished += 1
+    end
+    def start
+      @started += 1
+    end
+    def reset?
+      @started == @finished + 1
+    end
+    def started?
+      @started >= 1
+    end
+    def finished?
+      @finished >= 1
+    end
+  end
 
+  def basic_connection
+    c = BasicConnection.new
     conns["#{@uri.host}:#{@uri.port}"] = c
     c
   end
@@ -124,8 +135,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_connection_for_cached
-    cached = Object.new
-    def cached.started?; true end
+    cached = basic_connection
+    cached.start
     conns['example.com:80'] = cached
 
     c = @http.connection_for @uri
@@ -165,9 +176,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_connection_for_host_down
-    cached = Object.new
-    def cached.address; 'example.com' end
-    def cached.port; 80 end
+    cached = basic_connection
     def cached.start; raise Errno::EHOSTDOWN end
     def cached.started?; false end
     conns['example.com:80'] = cached
@@ -208,9 +217,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_connection_for_refused
-    cached = Object.new
-    def cached.address; 'example.com' end
-    def cached.port; 80 end
+    cached = basic_connection
     def cached.start; raise Errno::ECONNREFUSED end
     def cached.started?; false end
     conns['example.com:80'] = cached
@@ -223,7 +230,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_error_message
-    c = Object.new
+    c = basic_connection
     reqs[c.object_id] = 5
 
     assert_equal "after 5 requests on #{c.object_id}", @http.error_message(c)
@@ -236,12 +243,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_finish
-    c = Object.new
-    c.instance_variable_set :@started, false
-    def c.finish; @finished = true end
-    def c.finished?; @finished end
-    def c.start; @started = true end
-    def c.started?; @started end
+    c = basic_connection
     reqs[c.object_id] = 5
 
     @http.finish c
@@ -252,12 +254,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_finish_io_error
-    c = Object.new
-    c.instance_variable_set :@started, false
-    def c.finish; @finished = true; raise IOError end
-    def c.finished?; @finished end
-    def c.start; @started = true end
-    def c.started?; @started end
+    c = basic_connection
+    def c.finish; @finished += 1; raise IOError end
     reqs[c.object_id] = 5
 
     @http.finish c
@@ -334,26 +332,20 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_reset
-    c = Object.new
-    def c.finish; @finished = true end
-    def c.finished?; @finished end
-    def c.start; @started = true end
-    def c.started?; @started end
+    c = basic_connection
+    c.start
     reqs[c.object_id] = 5
 
     @http.reset c
 
     assert c.started?
     assert c.finished?
+    assert c.reset?
     assert_nil reqs[c.object_id]
   end
 
   def test_reset_io_error
-    c = Object.new
-    def c.finish; @finished = true; raise IOError end
-    def c.finished?; @finished end
-    def c.start; @started = true end
-    def c.started?; @started end
+    c = basic_connection
     reqs[c.object_id] = 5
 
     @http.reset c
@@ -363,10 +355,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_reset_host_down
-    c = Object.new
-    def c.address; 'example.com' end
-    def c.finish; end
-    def c.port; 80 end
+    c = basic_connection
     def c.start; raise Errno::EHOSTDOWN end
     reqs[c.object_id] = 5
 
@@ -378,10 +367,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_reset_refused
-    c = Object.new
-    def c.address; 'example.com' end
-    def c.finish; end
-    def c.port; 80 end
+    c = basic_connection
     def c.start; raise Errno::ECONNREFUSED end
     reqs[c.object_id] = 5
 
@@ -505,6 +491,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     @http.request @uri
 
+    assert c.reset?
     assert c.finished?
   end
 
@@ -557,7 +544,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_shutdown_not_started
-    c = Object.new
+    c = basic_connection
     def c.finish() raise IOError end
 
     conns["#{@uri.host}:#{@uri.port}"] = c

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 4
-  version: "1.4"
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +36,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-09-30 00:00:00 -07:00
+date: 2010-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency