activerecord-bogacs 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3da20a4a7e44c77643b1cf11b949e5fb818d43ca
-  data.tar.gz: 4bd02da78f04b586079c01ef3d3429d13821337e
+SHA256:
+  metadata.gz: 8d7d0cf56d16097d5faadc25e31228e1e6b6a1040703aa0fed0fd29a49d23622
+  data.tar.gz: 7f00210ced14e5963220980fd749d0c8765d7555deab200c508daa44ca0770c7
 SHA512:
-  metadata.gz: bc86fe344a38859c20e2c41c4017a5d5e3d1c802a2879cc80376c8f9f286d7ec9496851217f98197869558edfb08aca4c37eab0c873a4b1538a6f2d1aadbd39b
-  data.tar.gz: 8de7842694c6ad26a9a904c0c8656dc5b1a6924771e3c8a106a53a917f82928a59bfec09123317c93813d89c9a009e1e99c392fa2549d0e6a23e71dc6c805a65
+  metadata.gz: ebc49df8d9f33381b3134b4dec5b5765abb06bb69b353f21ce695e9f0c4869f9ef36ad4005d6a716d2f73bebfe986158cfc237dd477f6247594a57337adb7bef
+  data.tar.gz: adc08a3fd5b9c6a2dde6daf9e75433c29fc7faf6c6832cd90e1fb8cf7f2be8a3df1e054486c13c22e8d5be1d4e3df74f4a42e27453d145b84a086e17f30efae4

data/.travis.yml

@@ -1,63 +1,61 @@
 language: ruby
 sudo: false
 jdk:
-  #- openjdk6
-  - oraclejdk7
+  - openjdk7
   - oraclejdk8
 rvm:
-  - jruby-1.7.24
-  #- 2.1.2
+  - jruby-1.7.25
 before_install:
-  - ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
+    - unset _JAVA_OPTIONS
+    - export AR_JDBC_VERSION="~> 1.3.24" # due the 50.0   release mess -> not specifying AR ~> 5.0
 before_script:
-  #- echo \"JRUBY_OPTS: $JRUBY_OPTS\"
-  - export JRUBY_OPTS="$JRUBY_OPTS --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
   - export JAVA_OPTS="$JAVA_OPTS" # -Xmx600M
+  - 'echo "JAVA_OPTS: $JAVA_OPTS"'
+  - export JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
+  - 'echo "JRUBY_OPTS: $JRUBY_OPTS"'
 script:
-  - bundle exec rake tomcat:jndi:download tomcat:jdbc:download tomcat:dbcp:download
-  - bundle exec rake c3p0:download
-  - bundle exec rake hikari:download
-  - bundle exec rake dbcp:download
-  - bundle exec rake db:create:mysql db:create:postgresql
+  - jruby -rbundler/setup -S rake tomcat:jndi:download tomcat:jdbc:download tomcat:dbcp:download
+  - jruby -rbundler/setup -S rake c3p0:download hikari:download dbcp:download
+  - jruby -rbundler/setup -S rake db:create:mysql db:create:postgresql
 env:
-  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.12"
-  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.2-java6"
-  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.11" HIKARI_VERSION="2.0.1-java6"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.13" HIKARI_VERSION="2.3.12"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.13" HIKARI_VERSION="2.3.2-java6"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.13" HIKARI_VERSION="2.0.1-java6"
   - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 3.2.18" HIKARI_VERSION="1.4.0"
-  - JRUBY_OPTS="--1.8 $JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 3.2.18" HIKARI_VERSION="2.2.5-java6"
+  - JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.2.8" HIKARI_VERSION="2.2.5-java6"
 matrix:
   #allow_failures:
     #- rvm: jruby-head
   exclude:
-    - rvm: jruby-1.7.24
-      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.12"
-      jdk: oraclejdk7
-    - rvm: jruby-1.7.24
-      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.9" HIKARI_VERSION="2.3.2-java6"
+    - rvm: jruby-9.1.16.0
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="4.2.8" HIKARI_VERSION="2.3.12"
+      jdk: openjdk7
+    - rvm: jruby-9.1.16.0
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="4.2.8" HIKARI_VERSION="2.3.2-java6"
       jdk: oraclejdk8
-    - rvm: jruby-1.7.24
-      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.13" HIKARI_VERSION="2.0.1-java6"
+    - rvm: jruby-1.7.25
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.16" HIKARI_VERSION="2.0.1-java6"
       jdk: oraclejdk8
-    - rvm: jruby-1.7.24
+    - rvm: jruby-1.7.25
       env: JRUBY_OPTS="--1.8 $JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 3.2.18" HIKARI_VERSION="2.2.5-java6"
       jdk: oraclejdk8
   include:
     - rvm: jruby-9.0.5.0
       env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.13" HIKARI_VERSION="2.2.5-java6"
-      jdk: oraclejdk7
-    - rvm: jruby-9.1.2.0
+      jdk: openjdk7
+    - rvm: jruby-9.1.8.0
       env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 3.2.18" HIKARI_VERSION="2.3.9"
       jdk: oraclejdk8
     # AR 4.2
-    - rvm: jruby-1.7.22
+    - rvm: jruby-1.7.27
       env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.1.13" HIKARI_VERSION="2.2.5-java6"
-      jdk: oraclejdk7
-    - rvm: jruby-9.1.2.0
-      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.2.4" HIKARI_VERSION="2.3.12"
+      jdk: openjdk7
+    - rvm: jruby-9.1.16.0
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=mysql AR_VERSION="~> 4.2.8" HIKARI_VERSION="2.3.12"
       jdk: oraclejdk8
-    - rvm: jruby-1.7.22
-      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.2.4" HIKARI_VERSION="2.2.5-java6"
+    - rvm: jruby-9.1.16.0
+      env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.2.8" HIKARI_VERSION="2.2.5-java6"
       jdk: oraclejdk8
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.16.0
       env: JRUBY_OPTS="$JRUBY_OPTS" AR_ADAPTER=postgresql AR_VERSION="~> 4.1.13" HIKARI_VERSION="2.3.12"
-      jdk: oraclejdk7
+      jdk: openjdk7

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2015 [Karol Bucek](http://kares.org)
+Copyright (c) 2013-2017 [Karol Bucek](http://kares.org)
 
 MIT License
 

data/README.md

@@ -43,7 +43,7 @@ end
 
 pools are expected to work with older ActiveRecord versions, if not let us know.
 
-### Default Pool
+### [Default Pool][2]
 
 Meant as a back-port for users stuck with old Rails versions (< 4.0) on production,
 facing potential (pool related) concurrency bugs e.g. with high-loads under JRuby.
@@ -52,7 +52,7 @@ Based on pool code from 4.x (which works much better than any previous version),
 with a few minor tunings and extensions such as `pool_initial: 0.5` which allows
 to specify how many connections to initialize in advance when the pool is created.
 
-### False Pool
+### [False Pool][3]
 
 The false pool won't do any actual pooling, it is assumed that an underlying pool
 is configured. Still, it does maintain a hash of AR connections mapped to threads.
@@ -82,7 +82,7 @@ default Tomcat JDBC pool) :
       maxWait: <%= (( ENV['POOL_TIMEOUT'] || 5.0 ).to_f * 1000).to_i %> # default 30s
 ```
 
-ActiveRecord-JDBC adapter allows you to lookup connection from JNDI using the
+[ActiveRecord-JDBC][5] adapter allows you to lookup connection from JNDI using the
 following configuration :
 
 ```
@@ -117,7 +117,11 @@ Only tested with ActiveRecord-JDBC-Adapter using the official Postgres' driver.
 
 ## Copyright
 
-Copyright (c) 2015 [Karol Bucek](http://kares.org).
+Copyright (c) 2017 [Karol Bucek](http://kares.org).
 See LICENSE (http://en.wikipedia.org/wiki/MIT_License) for details.
 
-[0]: http://res.cloudinary.com/kares/image/upload/c_scale,h_600,w_800/v1406451696/bogacs.jpg
+[0]: http://res.cloudinary.com/kares/image/upload/c_scale,h_600,w_800/v1406451696/bogacs.jpg
+[1]: http://www.rubydoc.info/gems/activerecord-bogacs/
+[2]: http://www.rubydoc.info/gems/activerecord-bogacs/ActiveRecord/Bogacs/DefaultPool
+[3]: http://www.rubydoc.info/gems/activerecord-bogacs/ActiveRecord/Bogacs/FalsePool
+[5]: https://github.com/jruby/activerecord-jdbc-adapter

data/lib/active_record/bogacs.rb

@@ -1,57 +1,6 @@
-require 'active_record/bogacs/version'
-
 require 'active_record'
-require 'active_record/version'
-require 'active_record/connection_adapters/abstract/connection_pool'
-
-module ActiveRecord
-  module Bogacs
-    autoload :DefaultPool, 'active_record/bogacs/default_pool'
-    autoload :FalsePool, 'active_record/bogacs/false_pool'
-    autoload :ShareablePool, 'active_record/bogacs/shareable_pool'
-    autoload :Reaper, 'active_record/bogacs/reaper'
-    autoload :Validator, 'active_record/bogacs/validator'
-  end
-  autoload :SharedConnection, 'active_record/shared_connection'
-end
-
-# NOTE: needs explicit configuration - before connection gets established e.g.
-#
-#   klass = ActiveRecord::Bogacs::FalsePool
-#   ActiveRecord::ConnectionAdapters::ConnectionHandler.connection_pool_class = klass
-#
-module ActiveRecord
-  module ConnectionAdapters
-    # @private there's no other way to change the pool class to use but to patch :(
-    ConnectionHandler.class_eval do
-
-      @@connection_pool_class = ConnectionAdapters::ConnectionPool
-
-      def connection_pool_class; @@connection_pool_class end
-      def self.connection_pool_class=(klass); @@connection_pool_class = klass end
-
-      if ActiveRecord::VERSION::MAJOR > 3 # 4.x
 
-        def establish_connection(owner, spec)
-          @class_to_pool.clear
-          owner_to_pool[owner.name] = connection_pool_class.new(spec)
-        end
-
-      elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2
-
-        def establish_connection(name, spec)
-          @class_to_pool[name] =
-            ( @connection_pools[spec] ||= connection_pool_class.new(spec) )
-        end
-
-      else # 2.3/3.0/3.1
-
-        def establish_connection(name, spec)
-          @connection_pools[name] = connection_pool_class.new(spec)
-        end
-
-      end
+require 'active_record/bogacs/version'
+require 'active_record/bogacs/autoload'
 
-    end
-  end
-end
+require 'active_record/connection_adapters/pool_class.rb'

data/lib/active_record/bogacs/autoload.rb

@@ -0,0 +1,10 @@
+module ActiveRecord
+  module Bogacs
+    autoload :DefaultPool, 'active_record/bogacs/default_pool'
+    autoload :FalsePool, 'active_record/bogacs/false_pool'
+    autoload :ShareablePool, 'active_record/bogacs/shareable_pool'
+    autoload :Reaper, 'active_record/bogacs/reaper'
+    autoload :Validator, 'active_record/bogacs/validator'
+  end
+  autoload :SharedConnection, 'active_record/shared_connection'
+end

data/lib/active_record/bogacs/default_pool.rb

@@ -1,6 +1,8 @@
 require 'thread'
 require 'monitor'
 
+require 'active_record/version'
+
 require 'active_record/connection_adapters/adapter_compat'
 require 'active_record/bogacs/pool_support'
 require 'active_record/bogacs/thread_safe'
@@ -8,41 +10,13 @@ require 'active_record/bogacs/thread_safe'
 module ActiveRecord
   module Bogacs
 
-    # == Obtaining (checking out) a connection
-    #
-    # Connections can be obtained and used from a connection pool in several
-    # ways:
-    #
-    # 1. Simply use ActiveRecord::Base.connection as with Active Record 2.1 and
-    # earlier (pre-connection-pooling). Eventually, when you're done with
-    # the connection(s) and wish it to be returned to the pool, you call
-    # ActiveRecord::Base.clear_active_connections!.
-    # 2. Manually check out a connection from the pool with
-    # ActiveRecord::Base.connection_pool.checkout. You are responsible for
-    # returning this connection to the pool when finished by calling
-    # ActiveRecord::Base.connection_pool.checkin(connection).
-    # 3. Use ActiveRecord::Base.connection_pool.with_connection(&block), which
-    # obtains a connection, yields it as the sole argument to the block,
-    # and returns it to the pool after the block completes.
+    # A "default" `ActiveRecord::ConnectionAdapters::ConnectionPool`-like pool
+    # implementation with compatibility across (older) Rails versions.
     #
-    # Connections in the pool are actually AbstractAdapter objects (or objects
-    # compatible with AbstractAdapter's interface).
+    # Currently, mostly, based on ActiveRecord **4.2**.
     #
-    # == Options
+    # http://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/ConnectionPool.html
     #
-    # There are several connection-pooling-related options that you can add to
-    # your database connection configuration:
-    #
-    # * **pool**: number indicating size of connection pool (default 5)
-    # * **checkout_timeout**: number of seconds to block and wait for a connection
-    # before giving up and raising a timeout error (default 5 seconds).
-    # * **pool_initial**: number of connections to pre-initialize when the pool
-    # is created (default 0).
-    # * **reaping_frequency**: frequency in seconds to periodically run a reaper,
-    # which attempts to find and close "dead" connections (can occur if a caller
-    # forgets to close a connection at the end of a thread or a thread dies unexpectedly)
-    # Default is `nil`, which means don't run the periodical Reaper at all (reaping
-    # will still happen occasionally).
     class DefaultPool
       # Threadsafe, fair, FIFO queue. Meant to be used by ConnectionPool
       # with which it shares a Monitor. But could be a generic Queue.
@@ -106,9 +80,8 @@ module ActiveRecord
         # available, waiting up to +timeout+ seconds for an element to
         # become available.
         #
-        # Raises:
-        # - ConnectionTimeoutError if +timeout+ is given and no element
-        # becomes available after +timeout+ seconds,
+        # @raise [ActiveRecord::ConnectionTimeoutError] if +timeout+ given and no element
+        # becomes available after +timeout+ seconds
         def poll(timeout = nil, &block)
           synchronize do
             if timeout
@@ -186,12 +159,28 @@ module ActiveRecord
       attr_reader :spec, :connections, :size, :reaper, :validator
       attr_reader :initial_size
 
-      # Creates a new ConnectionPool object. +spec+ is a ConnectionSpecification
+      # Creates a new `ConnectionPool` object. +spec+ is a ConnectionSpecification
       # object which describes database connection information (e.g. adapter,
       # host name, username, password, etc), as well as the maximum size for
       # this ConnectionPool.
       #
-      # The default ConnectionPool maximum size is 5.
+      # @note The default ConnectionPool maximum size is **5**.
+      #
+      # @param [Hash] spec a `ConnectionSpecification`
+      #
+      # @option spec.config [Integer] :pool number indicating size of connection pool (default 5)
+      # @option spec.config [Float] :checkout_timeout number of seconds to block and
+      # wait for a connection before giving up raising a timeout (default 5 seconds).
+      # @option spec.config [Integer] :pool_initial number of connections to pre-initialize
+      # when the pool is created (default 0).
+      # @option spec.config [Float] :reaping_frequency frequency in seconds to periodically
+      # run a reaper, which attempts to find and close "dead" connections (can occur
+      # if a caller forgets to close a connection at the end of a thread or a thread
+      # dies unexpectedly) default is `nil` - don't run the periodical Reaper (reaping
+      # will still happen occasionally).
+      # @option spec.config [Float] :validate_frequency frequency in seconds to periodically
+      # run a connection validation (in a separate thread), to avoid potentially stale
+      # sockets when connections stay open (pooled but unused) for longer periods.
       def initialize(spec)
         super()
 
@@ -230,7 +219,7 @@ module ActiveRecord
           require 'active_record/bogacs/validator' unless self.class.const_defined?(:Validator)
           @validator = Validator.new self, frequency, spec.config[:validate_timeout]
           if @validator.run && @reaping
-            logger && logger.info("pool: validator configured alongside with reaper")
+            logger && logger.warn(":validate_frequency configured alongside with :reaping_frequency")
           end
         end
       end
@@ -372,7 +361,7 @@ module ActiveRecord
 
       # Check-in a database connection back into the pool.
       #
-      # @param [ActiveRecord::ConnectionAdapters::AbstractAdapter] connection
+      # @param conn [ActiveRecord::ConnectionAdapters::AbstractAdapter] connection
       # object, which was obtained earlier by calling #checkout on this pool
       # @see #checkout
       def checkin(conn, released = nil)
@@ -440,8 +429,8 @@ module ActiveRecord
       # connection if the pool is not at capacity, 3) waiting on the
       # queue for a connection to become available.
       #
-      # Raises:
-      # - ConnectionTimeoutError if a connection could not be acquired
+      # @raise [ActiveRecord::ConnectionTimeoutError]
+      # @raise [ActiveRecord::ConnectionNotEstablished]
       def acquire_connection
         if conn = @available.poll
           conn
@@ -488,4 +477,4 @@ module ActiveRecord
     end
 
   end
-end
+end

data/lib/active_record/bogacs/false_pool.rb

@@ -1,3 +1,5 @@
+require 'active_record/version'
+
 require 'active_record/bogacs/pool_support'
 require 'active_record/bogacs/thread_safe'
 
@@ -126,17 +128,8 @@ module ActiveRecord
       # Check-out a database connection from the pool, indicating that you want
       # to use it. You should call #checkin when you no longer need this.
       #
-      # This is done by either returning and leasing existing connection, or by
-      # creating a new connection and leasing it.
-      #
-      # If all connections are leased and the pool is at capacity (meaning the
-      # number of currently leased connections is greater than or equal to the
-      # size limit set), an ActiveRecord::ConnectionTimeoutError exception will be raised.
-      #
-      # Returns: an AbstractAdapter object.
-      #
-      # Raises:
-      # - ConnectionTimeoutError: no connection can be obtained from the pool.
+      # @return [ActiveRecord::ConnectionAdapters::AbstractAdapter]
+      # @raise [ActiveRecord::ConnectionTimeoutError] no connection can be obtained from the pool
       def checkout
         #synchronize do
           conn = checkout_new_connection # acquire_connection
@@ -149,8 +142,9 @@ module ActiveRecord
       # Check-in a database connection back into the pool, indicating that you
       # no longer need this connection.
       #
-      # +conn+: an AbstractAdapter object, which was obtained by earlier by
-      # calling +checkout+ on this pool.
+      # @param conn [ActiveRecord::ConnectionAdapters::AbstractAdapter] connection
+      # object, which was obtained earlier by calling #checkout on this pool
+      # @see #checkout
       def checkin(conn, do_release = true)
         release(conn) if do_release
         #synchronize do
@@ -173,13 +167,7 @@ module ActiveRecord
 
       private
 
-      # Acquire a connection by one of 1) immediately removing one
-      # from the queue of available connections, 2) creating a new
-      # connection if the pool is not at capacity, 3) waiting on the
-      # queue for a connection to become available.
-      #
-      # Raises:
-      # - ConnectionTimeoutError if a connection could not be acquired
+      # @raise [ActiveRecord::ConnectionTimeoutError]
       def acquire_connection
         # underlying pool will poll and block if "empty" (all checked-out)
         #if conn = @available.poll

data/lib/active_record/bogacs/pool_support.rb

@@ -1,4 +1,3 @@
-#require 'thread_safe'
 
 module ActiveRecord
   module Bogacs

data/lib/active_record/bogacs/reaper.rb

@@ -3,22 +3,20 @@ require 'thread'
 module ActiveRecord
   module Bogacs
 
-    # Every +frequency+ seconds, the reaper will "reap" a pool it belongs to.
+    # Every *frequency* seconds, the reaper will "reap" a pool it belongs to.
     # Reaping means detecting stale cached connections in the pool - those that
     # were checked-out by a thread but never checked back in after the thread
     # finished/died.
     #
-    # @note This version is fail safe - raised errors won't stop the reaping process.
-    # Instead the thread will be restarted and reaping continues at the next tick.
-    #
-    # Configure the frequency by setting `:reaping_frequency` in your database yaml file.
+    # Configure the frequency by setting `:reaping_frequency` in your database.yml.
     #
+    # @note This version is fail safe - raised errors won't stop the reaping process.
     class Reaper
 
       attr_reader :pool, :frequency
       attr_accessor :retry_error
 
-      # Reaper.new(self, spec.config[:reaping_frequency]).run
+      # `Reaper.new(pool, spec.config[:reaping_frequency]).run`
       # @private
       def initialize(pool, frequency)
         @pool = pool;

data/lib/active_record/bogacs/shareable_pool.rb

@@ -1,9 +1,9 @@
+require 'active_record/version'
 require 'active_record/connection_adapters/abstract/connection_pool'
 
 require 'thread'
 
 require 'active_record/bogacs/thread_safe'
-
 require 'active_record/bogacs/pool_support'
 
 # NOTE: needs explicit configuration - before connection gets established e.g.

data/lib/active_record/bogacs/validator.rb

@@ -12,13 +12,9 @@ require 'active_record/bogacs/thread_safe'
 module ActiveRecord
   module Bogacs
 
-    # Every +frequency+ seconds, the _validator_ will perform connection validation
+    # Every *frequency* seconds, the _validator_ will perform connection validation
     # on a pool it operates.
     #
-    # @note Do not use a reaper with the validator as reaping (stale connection detection
-    # and removal) is part of the validation process and will only likely slow things down
-    # as all pool connection updates needs to be synchronized.
-    #
     # Configure the frequency by setting `:validate_frequency` in your AR configuration.
     #
     # We recommend not setting values too low as that would drain the pool's performance
@@ -26,11 +22,15 @@ module ActiveRecord
     # checkout - the validator is intended to detect long idle pooled connections "ahead
     # of time" instead of upon retrieval.
     #
+    # @note Do not use a reaper with the validator!
+    # Reaping (stale connection detection and removal) is part of the validation
+    # process and will only slow things down as all pool connection updates needs
+    # to be synchronized.
     class Validator
 
       attr_reader :pool, :frequency, :timeout
 
-      # Validator.new(self, spec.config[:validate_frequency]).run
+      # `Validator.new(pool, spec.config[:validate_frequency]).run`
       # @private
       def initialize(pool, frequency = 60, timeout = nil)
         @pool = pool; PoolAdaptor.adapt! pool

data/lib/active_record/bogacs/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bogacs
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
-end
+end

data/lib/active_record/connection_adapters/pool_class.rb

@@ -0,0 +1,44 @@
+require 'active_record'
+require 'active_record/version'
+require 'active_record/connection_adapters/abstract/connection_pool'
+
+# NOTE: needs explicit configuration - before connection gets established e.g.
+#
+#   klass = ActiveRecord::Bogacs::FalsePool
+#   ActiveRecord::ConnectionAdapters::ConnectionHandler.connection_pool_class = klass
+#
+module ActiveRecord
+  module ConnectionAdapters
+    # @private there's no other way to change the pool class to use but to patch :(
+    ConnectionHandler.class_eval do
+
+      @@connection_pool_class = ConnectionAdapters::ConnectionPool
+
+      def connection_pool_class; @@connection_pool_class end
+      def self.connection_pool_class=(klass); @@connection_pool_class = klass end
+
+      if ActiveRecord::VERSION::MAJOR > 3 # 4.x
+
+        def establish_connection(owner, spec)
+          @class_to_pool.clear
+          owner_to_pool[owner.name] = connection_pool_class.new(spec)
+        end
+
+      elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2
+
+        def establish_connection(name, spec)
+          @class_to_pool[name] =
+            ( @connection_pools[spec] ||= connection_pool_class.new(spec) )
+        end
+
+      else # 2.3/3.0/3.1
+
+        def establish_connection(name, spec)
+          @connection_pools[name] = connection_pool_class.new(spec)
+        end
+
+      end
+
+    end
+  end
+end

data/test/test_helper.rb

@@ -52,6 +52,8 @@ prepared_statements = ENV['AR_PREPARED_STATEMENTS'] # || true
 config[:'prepared_statements'] = prepared_statements if prepared_statements
 #jdbc_properties = { 'logUnclosedConnections' => true, 'loginTimeout' => 5 }
 #config[:'properties'] = jdbc_properties
+config[:'properties'] ||= {}
+config[:'properties']['useSSL'] ||= 'false' if config[:adapter].starts_with?('mysql')
 
 checkout_timeout = ENV['AR_POOL_CHECKOUT_TIMEOUT'] || checkout_timeout
 config[:'checkout_timeout'] = checkout_timeout.to_f if checkout_timeout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bogacs
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Karol Bucek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ files:
 - Rakefile
 - activerecord-bogacs.gemspec
 - lib/active_record/bogacs.rb
+- lib/active_record/bogacs/autoload.rb
 - lib/active_record/bogacs/default_pool.rb
 - lib/active_record/bogacs/false_pool.rb
 - lib/active_record/bogacs/pool_support.rb
@@ -77,6 +78,7 @@ files:
 - lib/active_record/bogacs/validator.rb
 - lib/active_record/bogacs/version.rb
 - lib/active_record/connection_adapters/adapter_compat.rb
+- lib/active_record/connection_adapters/pool_class.rb
 - lib/active_record/shared_connection.rb
 - test/active_record/bogacs/default_pool_test.rb
 - test/active_record/bogacs/false_pool_test.rb
@@ -108,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: 'Bogacs contains several pool implementations that can be used as a replacement