connection_pool 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f87d3feec72672723a367bfa62719c8b7af8a35
-  data.tar.gz: 51632684b4d5b93d6de0215180dc0f4e8a2ab922
+  metadata.gz: cf8177bf07f6c8e68b13f28416f6ccc0c64803af
+  data.tar.gz: ff9c836ce5576d4d0cb1edf8d858a761f982e437
 SHA512:
-  metadata.gz: b3912e67f7b3f01f6e89047a56eb1f08f80820f5a154d0acde2d05f977d7566a33eacce3cee792ce2a52485b3218b9d718e4bacb89aafa050791166fb8d6e337
-  data.tar.gz: 0d2e0ee5ad0c23db00b32737b82f0693cb70e2f5de0f7a5afa03c5ae7ac22765d13b0073086940c12edf6b5a00605e8db1a1ddecc80d373417448ba67e0bcfca
+  metadata.gz: 73bda4d8d0b3cc9daef5c93bb98b7649d811bd5c8f467e25c3aaf7d3353541225e7b30e1efd481a14e45f5c56b5fc846d49dabdd9a167702a71c4a9631a9b6a2
+  data.tar.gz: a331275f67b3635e09792e646113e32bdc74254a2cdff032e972c6f2ebedd6391a1e508c36be7c4e33b40e2a07efe029a2ad0267c3ba4dc20b22813df86427bb

data/.travis.yml

@@ -3,12 +3,8 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - jruby
-  - rbx-2
-notifications:
-  email:
-    - drbrain@segment7.net

data/Changes.md

@@ -1,6 +1,12 @@
 connection\_pool changelog
 ---------------------------
 
+2.2.2
+------
+
+- Add pool `size` and `available` accessors for metrics and monitoring
+  purposes [#97, robholland]
+
 2.2.1
 ------
 

data/lib/connection_pool.rb

@@ -51,6 +51,7 @@ class ConnectionPool
 
     @available = TimedStack.new(@size, &block)
     @key = :"current-#{@available.object_id}"
+    @key_count = :"current-#{@available.object_id}-count"
   end
 
 if Thread.respond_to?(:handle_interrupt)
@@ -84,20 +85,26 @@ else
 end
 
   def checkout(options = {})
-    conn = if stack.empty?
-      timeout = options[:timeout] || @timeout
-      @available.pop(timeout: timeout)
+    if ::Thread.current[@key]
+      ::Thread.current[@key_count]+= 1
+      ::Thread.current[@key]
     else
-      stack.last
+      ::Thread.current[@key_count]= 1
+      ::Thread.current[@key]= @available.pop(options[:timeout] || @timeout)
     end
-
-    stack.push conn
-    conn
   end
 
   def checkin
-    conn = pop_connection # mutates stack, must be on its own line
-    @available.push(conn) if stack.empty?
+    if ::Thread.current[@key]
+      if ::Thread.current[@key_count] == 1
+        @available.push(::Thread.current[@key])
+        ::Thread.current[@key]= nil
+      else
+        ::Thread.current[@key_count]-= 1
+      end
+    else
+      raise ConnectionPool::Error, 'no connections are checked out'
+    end
 
     nil
   end
@@ -106,20 +113,18 @@ end
     @available.shutdown(&block)
   end
 
-  private
-
-  def pop_connection
-    if stack.empty?
-      raise ConnectionPool::Error, 'no connections are checked out'
-    else
-      stack.pop
-    end
+  # Size of this connection pool
+  def size
+    @size
   end
 
-  def stack
-    ::Thread.current[@key] ||= []
+  # Number of pool entries available for checkout at this instant.
+  def available
+    @available.length
   end
 
+  private
+
   class Wrapper < ::BasicObject
     METHODS = [:with, :pool_shutdown]
 
@@ -135,6 +140,14 @@ end
       @pool.shutdown(&block)
     end
 
+    def pool_size
+      @pool.size
+    end
+
+    def pool_available
+      @pool.available
+    end
+
     def respond_to?(id, *args)
       METHODS.include?(id) || with { |c| c.respond_to?(id, *args) }
     end

data/lib/connection_pool/timed_stack.rb

@@ -28,6 +28,7 @@ class ConnectionPool::PoolShuttingDownError < RuntimeError; end
 #    #=> raises Timeout::Error after 5 seconds
 
 class ConnectionPool::TimedStack
+  attr_reader :max
 
   ##
   # Creates a new pool with +size+ connections that are created from the given

data/lib/connection_pool/version.rb

@@ -1,3 +1,3 @@
 class ConnectionPool
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/test/test_connection_pool.rb

@@ -498,4 +498,19 @@ class TestConnectionPool < Minitest::Test
 
     assert_equal ['with', 'wrapped'], recorder.calls
   end
+
+  def test_stats_without_active_connection
+    pool = ConnectionPool.new(size: 2) { NetworkConnection.new }
+
+    assert_equal(2, pool.size)
+    assert_equal(2, pool.available)
+  end
+
+  def test_stats_with_active_connection
+    pool = ConnectionPool.new(size: 2) { NetworkConnection.new }
+
+    pool.with do
+      assert_equal(1, pool.available)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connection_pool
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Mike Perham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-12 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Generic connection pool for Ruby
@@ -104,4 +104,3 @@ test_files:
 - test/helper.rb
 - test/test_connection_pool.rb
 - test/test_connection_pool_timed_stack.rb
-has_rdoc: