pools 0.1.3 → 0.1.4

data/lib/pools/connection_pool.rb

@@ -5,7 +5,6 @@
 require 'thread'
 require 'monitor'
 require 'set'
-require 'active_support/core_ext/module/synchronization'
 
 module Pools
   # Raised when a connection could not be obtained within the connection
@@ -60,6 +59,7 @@ module Pools
   # * +wait_timeout+: number of seconds to block and wait for a connection
   #   before giving up and raising a timeout error (default 5 seconds).
   class ConnectionPool
+    include MonitorMixin
     attr_reader :options, :connections
 
     # Creates a new ConnectionPool object. +spec+ is a ConnectionSpecification
@@ -69,6 +69,7 @@ module Pools
     #
     # The default ConnectionPool maximum size is 5.
     def initialize(pooled, options)
+      super()
       @pooled = pooled
       @options = options
 
@@ -76,8 +77,7 @@ module Pools
       @reserved_connections = {}
 
       # The mutex used to synchronize pool access
-      @connection_mutex = Monitor.new
-      @queue = @connection_mutex.new_cond
+      @queue = self.new_cond
 
       # default 5 second timeout unless on ruby 1.9
       @timeout = options[:wait_timeout] || 5
@@ -119,27 +119,29 @@ module Pools
 
     # Returns true if a connection has already been opened.
     def connected?
-      !@connections.empty?
+      synchronize { !@connections.empty? }
     end
 
     # Disconnects all connections in the pool, and clears the pool.
     def disconnect!
-      @reserved_connections.each do |name,conn|
-        checkin conn
-      end
-      @reserved_connections = {}
-      @connections.each do |conn|
-        @pooled.__disconnect(conn)
+      synchronize do
+        @reserved_connections = {}
+        @connections.each do |conn|
+          checkin conn
+          @pooled.__disconnect(conn)
+        end
+        @connections = []
       end
-      @connections = []
     end
 
     # Verify active connections and remove and disconnect connections
     # associated with stale threads.
     def verify_active_connections! #:nodoc:
-      clear_stale_cached_connections!
-      @connections.each do |connection|
-        @pooled.__disconnect(connection)
+      synchronize do
+        clear_stale_cached_connections!
+        @connections.each do |connection|
+          @pooled.__disconnect(connection)
+        end
       end
     end
 
@@ -173,7 +175,7 @@ module Pools
     #   within the timeout period.
     def checkout
       # Checkout an available connection
-      @connection_mutex.synchronize do
+      synchronize do
         loop do
           conn = if @checked_out.size < @connections.size
                    checkout_existing_connection
@@ -203,15 +205,12 @@ module Pools
     # +conn+: an AbstractAdapter object, which was obtained by earlier by
     # calling +checkout+ on this pool.
     def checkin(conn)
-      @connection_mutex.synchronize do
+      synchronize do
         @checked_out.delete conn
         @queue.signal
       end
     end
 
-    synchronize :verify_active_connections!, :connected?, :disconnect!,
-                :with => :@connection_mutex
-
   private
     def current_connection_id #:nodoc:
       Thread.current.object_id

metadata

@@ -1,56 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pools
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Michael Rykov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70307295130540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        version: "3.2"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id001
-description: |
-  Generalized connection pooling
+  prerelease: false
+  version_requirements: *70307295130540
+description: ! 'Generalized connection pooling
 
+'
 email: mrykov@gmail
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - Rakefile
 - LICENSE
@@ -65,36 +47,26 @@ files:
 - lib/redis/pooled_store.rb
 homepage: http://github.com/rykov/pools
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Generalized connection pooling
 test_files: []
-