pools 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d912c05a123c98e6d766cdf24ad2e11c3bf71e5c
-  data.tar.gz: 1e9b4cf802a477fc9dceadc1bb6de4606db68d97
+  metadata.gz: 70a334b882b61ca1b32aec8d628d2374caf93c45
+  data.tar.gz: b857dfbedbeaea85e88eae1199a4a5c586c4bc5f
 SHA512:
-  metadata.gz: 7934474abed31f23d125e08745199736af73f7433e4e10cba7b5ca921783278728795e7fa30f0223b204ed9551e018840d48093326bc077452a84e367175f79d
-  data.tar.gz: 91caa2af12554950c1b24de820ecd3e7b1a4d62ece249f9439fde44e24c94a291f47c177235e0917445d9b02cddb6ee81da454c34676f582a7c67465b72d228a
+  metadata.gz: 1a71428a4b1e7a76d35b02ddd1d4ed951776e6a7d8cc32e92dbe8d6b7d918aff3f543a8358cdc247b78104ebe5be967bbbdc39ad1217b3784b52d612c118b8c9
+  data.tar.gz: f0a6155dae531c56a789dc36d2719018bf608dc76218d6d4470874c983b43ca81295979608ff6c557095e9383638c4828fd487706fb592d4ff1c00abc4740ffb

data/lib/pools/connection_pool.rb

@@ -95,15 +95,19 @@ module Pools
     # #connection can be called any number of times; the connection is
     # held in a hash keyed by the thread id.
     def connection
-      @reserved_connections[current_connection_id] ||= checkout
+      @reserved_connections[current_connection_id] || synchronize do
+        @reserved_connections[current_connection_id] ||= checkout
+      end
     end
 
     # Signal that the thread is finished with the current connection.
     # #release_connection releases the connection-thread association
     # and returns the connection to the pool.
     def release_connection(with_id = current_connection_id)
-      conn = @reserved_connections.delete(with_id)
-      checkin conn if conn
+      synchronize do
+        conn = @reserved_connections.delete(with_id)
+        checkin conn if conn
+      end
     end
 
     # If a connection already exists yield it to the block.  If no connection
@@ -111,7 +115,7 @@ module Pools
     # connection when finished.
     def with_connection
       connection_id = current_connection_id
-      fresh_connection = true unless @reserved_connections[connection_id]
+      fresh_connection = synchronize { !@reserved_connections[connection_id] }
       yield connection
     ensure
       release_connection(connection_id) if fresh_connection
@@ -148,12 +152,14 @@ module Pools
     # Return any checked-out connections back to the pool by threads that
     # are no longer alive.
     def clear_stale_cached_connections!
-      keys = @reserved_connections.keys - Thread.list.find_all { |t|
-        t.alive?
-      }.map { |thread| thread.object_id }
-      keys.each do |key|
-        checkin @reserved_connections[key]
-        @reserved_connections.delete(key)
+      synchronize do
+        keys = @reserved_connections.keys - Thread.list.find_all { |t|
+          t.alive?
+        }.map { |thread| thread.object_id }
+        keys.each do |key|
+          checkin @reserved_connections[key]
+          @reserved_connections.delete(key)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pools
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Michael Rykov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport