gene_pool 1.0.1 → 1.1.0

data/.gitignore

@@ -1,2 +1,3 @@
 doc
 pkg
+.idea

data/README.rdoc

@@ -30,6 +30,13 @@ Generic pooling library for connection pools.
         # use socket here
       end
     end
+
+    def send_message_auto_retry
+      # On exception, close and reopen socket and perform retry
+      @@gene_pool.with_connection_auto_retry do |socket|
+        # use socket here, 
+      end
+    end
   end
 
 == Copyright

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.1.0

data/gene_pool.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gene_pool}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Pardee"]
-  s.date = %q{2010-09-12}
+  s.date = %q{2010-11-11}
   s.description = %q{Generic pooling library for creating a connection pool}
   s.email = %q{bradpardee@gmail.com}
   s.extra_rdoc_files = [

data/lib/gene_pool.rb

@@ -88,6 +88,33 @@ class GenePool
     end
   end
   
+  # Create a scope for checking out a connection while automatically retrying on exception
+  def with_connection_auto_retry(close_on_error = true)
+    with_connection do |connection|
+      begin
+        yield connection
+      rescue Exception => e
+        if close_on_error
+          connection.close rescue nil
+        end
+        if (e.kind_of?(Timeout::Error))
+          remove(connection)
+          raise
+        end
+        connection = renew(connection)
+        begin
+          yield connection
+        rescue Exception => e
+          if close_on_error
+            connection.close rescue nil
+          end
+          remove(connection)
+          raise
+        end
+      end
+    end
+  end
+
   # Remove an existing connection from the pool
   def remove(connection)
     @mutex.synchronize do

data/test/gene_pool_test.rb

@@ -15,6 +15,7 @@ class DummyConnection
   def initialize(count, sleep_time=nil)
     sleep sleep_time if sleep_time
     @count = count
+    @closed = false
   end
   
   def to_i
@@ -24,6 +25,18 @@ class DummyConnection
   def to_s
     @count.to_s
   end
+
+  def fail_on(*counts)
+    raise Exception.new("Dummy exception on count #{@count}") if counts.include?(@count)
+  end
+
+  def close
+    @closed = true
+  end
+
+  def closed?
+    @closed
+  end
 end
     
 
@@ -228,5 +241,53 @@ class GenePoolTest < Test::Unit::TestCase
       ival_conns.sort!
       assert_equal (1..pool_size).to_a, ival_conns
     end
+
+    should 'be able to auto-retry connection' do
+      i = 1
+      [false, true].each do |stat|
+        conns = []
+        @gene_pool.with_connection_auto_retry(stat) do |conn|
+          conns << conn
+          conn.fail_on(i)
+          assert_equal 1, @gene_pool.connections.size
+          assert_equal 1, @gene_pool.checked_out.size
+          assert_equal i+1, conn.to_i
+        end
+        assert_equal stat, conns[0].closed?
+        assert !conns[1].closed?
+        i += 1
+      end
+      assert_equal 1, @gene_pool.connections.size
+      assert_equal 0, @gene_pool.checked_out.size
+    end
+
+    should 'fail with auto-retry on double failure' do
+      e = assert_raises Exception do
+        @gene_pool.with_connection_auto_retry(false) do |conn|
+          conn.fail_on(1,2)
+        end
+      end
+      assert_match %r%Dummy exception%, e.message
+      assert_equal 0, @gene_pool.connections.size
+      assert_equal 0, @gene_pool.checked_out.size
+    end
+
+    should 'not auto-retry on timeout' do
+      @sleep = 2
+      @timeout = 1
+      e = assert_raises Timeout::Error do
+        @gene_pool.with_connection_auto_retry do |conn|
+        end
+      end
+      assert_equal 0, @gene_pool.connections.size
+      assert_equal 0, @gene_pool.checked_out.size
+      @sleep = 0
+      @gene_pool.with_connection_auto_retry do |conn|
+        assert_equal 2, conn.to_i
+        assert_equal 1, @gene_pool.checked_out.size
+      end
+      assert_equal 1, @gene_pool.connections.size
+      assert_equal 0, @gene_pool.checked_out.size
+    end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
     - 1
-    - 0
     - 1
-  version: 1.0.1
+    - 0
+  version: 1.1.0
 platform: ruby
 authors: 
   - Brad Pardee
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -04:00
+date: 2010-11-11 00:00:00 -05:00
 default_executable: 
 dependencies: []