net-http-persistent 1.3.1 → 1.4

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.4 / 2010-09-29
+
+* Minor Enhancements
+  * Added the very dangerous #shutdown_in_all_threads.  IT IS DANGEROUS!.
+    Patch by Torsten Schönebaum.
+
 === 1.3.1 / 2010-09-13
 
 * Bug Fixes

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.3.1'
+  VERSION = '1.4'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -388,13 +388,20 @@ class Net::HTTP::Persistent
   end
 
   ##
-  # Shuts down all connections in this thread.
+  # Shuts down all connections for +thread+.
+  # 
+  # Uses the current thread by default.
   #
-  # If you've used Net::HTTP::Persistent across multiple threads you must call
-  # this in each thread.
+  # If you've used Net::HTTP::Persistent across multiple threads you should
+  # call this in each thread when you're done making HTTP requests.
+  #
+  # *NOTE*: Calling shutdown for another thread can be dangerous!
+  #
+  # If the thread is still using the connection it may cause an error!  It is
+  # best to call #shutdown in the thread at the appropriate time instead!
 
-  def shutdown
-    connections = Thread.current[@connection_key]
+  def shutdown thread = Thread.current
+    connections = thread[@connection_key]
 
     connections.each do |_, connection|
       begin
@@ -403,8 +410,26 @@ class Net::HTTP::Persistent
       end
     end if connections
 
-    Thread.current[@connection_key] = nil
-    Thread.current[@request_key]    = nil
+    thread[@connection_key] = nil
+    thread[@request_key]    = nil
+  end
+
+  ##
+  # Shuts down all connections in all threads
+  #
+  # *NOTE*: THIS METHOD IS VERY DANGEROUS!
+  #
+  # Do not call this method if other threads are still using their
+  # connections!  Call #shutdown at the appropriate time instead!
+  #
+  # Use this method only as a last resort!
+  
+  def shutdown_in_all_threads
+    Thread.list.each do |thread|
+      shutdown thread
+    end
+
+    nil
   end
 
   ##

data/test/test_net_http_persistent.rb

@@ -575,6 +575,58 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_nil Thread.current[@http.request_key]
   end
 
+  def test_shutdown_thread
+    t = Thread.new do
+      c = connection
+      conns
+      reqs
+
+      Thread.stop
+
+      c
+    end
+
+    Thread.pass until t.status == 'sleep'
+
+    c = connection
+
+    @http.shutdown t
+
+    refute c.finished?
+
+    t.run
+    assert t.value.finished?
+    assert_nil t[@http.connection_key]
+    assert_nil t[@http.request_key]
+  end
+
+  def test_shutdown_in_all_threads
+    t = Thread.new do
+      c = connection
+      conns
+      reqs
+
+      Thread.stop
+
+      c
+    end
+
+    Thread.pass until t.status == 'sleep'
+
+    c = connection
+
+    assert_nil @http.shutdown_in_all_threads
+
+    assert c.finished?
+    assert_nil Thread.current[@http.connection_key]
+    assert_nil Thread.current[@http.request_key]
+
+    t.run
+    assert t.value.finished?
+    assert_nil t[@http.connection_key]
+    assert_nil t[@http.request_key]
+  end
+
   def test_ssl
     @http.verify_callback = :callback
     c = Net::HTTP.new 'localhost', 80

metadata

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