advanced_connection 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca32aa10dbd8b756bb82f0d2592a13ca1155ecc
-  data.tar.gz: 75a52b7b6983556c3c1c86670d60b419e1a42e23
+  metadata.gz: 6d9bda6b436e364dda841af17bf2b2915d3e261d
+  data.tar.gz: 6248d54d405b47f4bb26d8c38d3a102b71d78342
 SHA512:
-  metadata.gz: b48c3f8b4453614e6ee45d729f883b1a73112ccf88de8a947ca278815703817585764b0b4d1062e24b4708dd2172b75ffa023535de4e9d3a4ca421804664b331
-  data.tar.gz: 44d5368de1b9a5d70696ba8a0a726c728dfcb33cfd7ae5345bcc99f483c9e5c0e82542498c77b59ee5dea3e6c75731079fc0268b2bdcc4aa103c8e4626f55ed5
+  metadata.gz: 4ad06944f5895088cdf3c3b0edb8fea2f329a8f77b9a77ec5a0f76fe73fa6ca7d63f61c99d6227fa7a1302e817efc780b0cb97c126604976c3f1c7caf125db4c
+  data.tar.gz: 7d7ae267de0aa0973ea4ad381c01b8ce9ec07ee65f1be3dcb65672ed79e46e1ca2389e97559d12b7d99c15ea5edd1d27a07aaf700a4bf1f64a6ebfb802ed76b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    advanced_connection (0.5.12)
+    advanced_connection (0.5.13)
       activerecord (~> 4.1)
       activesupport (~> 4.1)
       rails (~> 4.1)
@@ -46,11 +46,8 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     builder (3.2.2)
-    charlock_holmes (0.7.3)
     coderay (1.1.1)
     concurrent-ruby (1.0.1)
-    copyright-header (1.0.15)
-      github-linguist (~> 2.6)
     coveralls (0.8.13)
       json (~> 1.8)
       simplecov (~> 0.11.0)
@@ -60,15 +57,9 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    escape_utils (1.0.1)
     ffi (1.9.10)
     ffi (1.9.10-java)
     formatador (0.2.5)
-    github-linguist (2.12.0)
-      charlock_holmes (~> 0.7.3)
-      escape_utils (~> 1.0.1)
-      mime-types (~> 1.19)
-      pygments.rb (~> 0.6.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     guard (2.13.0)
@@ -97,7 +88,9 @@ GEM
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     nenv (0.3.0)
@@ -107,7 +100,6 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     pg (0.18.4)
-    posix-spawn (0.3.11)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -119,9 +111,6 @@ GEM
       spoon (~> 0.0)
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
     rabbitt-githooks (1.6.1)
       rainbow (~> 2.0.0)
       thor (~> 0.19.1)
@@ -198,7 +187,6 @@ GEM
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   java
@@ -206,7 +194,6 @@ PLATFORMS
 
 DEPENDENCIES
   advanced_connection!
-  copyright-header (~> 1.0.15)
   coveralls (~> 0.8.13)
   guard-rspec (~> 4.6.4)
   pg (~> 0.18.4)

data/Rakefile

@@ -91,46 +91,6 @@ namespace :db do
   end
 end
 
-namespace :copyright do
-  namespace :headers do
-    desc 'add copyright headers'
-    task :add do
-      require 'copyright_header'
-
-      args = {
-        license:                        'MIT',
-        copyright_software:             'Advanced Connection',
-        copyright_software_description: "A Rails plugin providing an Idle Database Connection Manager",
-        copyright_holders:              ['Finalsite, LLC', 'Carl P. Corliss <carl.corliss@finalsite.com>'],
-        copyright_years:                ['2016'],
-        add_path:                       'lib',
-        output_dir:                     '.'
-      }
-
-      command_line = CopyrightHeader::CommandLine.new( args )
-      command_line.execute
-    end
-
-    desc 'remove copyright headers'
-    task :remove do
-      require 'copyright_header'
-
-      args = {
-        license:                        'MIT',
-        copyright_software:             'Advanced Connection',
-        copyright_software_description: "A Rails plugin providing an Idle Database Connection Manager",
-        copyright_holders:              ['Finalsite, LLC', 'Carl P. Corliss <carl.corliss@finalsite.com>'],
-        copyright_years:                ['2016'],
-        remove_path:                    'lib',
-        output_dir:                     '.'
-      }
-
-      command_line = CopyrightHeader::CommandLine.new( args )
-      command_line.execute
-    end
-  end
-end
-
 namespace :postgres do
   require 'active_record'
 

data/advanced_connection.gemspec

@@ -1,22 +1,22 @@
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 
 # Maintain your gem's version:
-require "advanced_connection/version"
+require 'advanced_connection/version'
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |spec|
-  spec.name        = "advanced_connection"
+  spec.name        = 'advanced_connection'
   spec.version     = AdvancedConnection::VERSION
-  spec.authors     = ["Carl P. Corliss"]
-  spec.email       = ["carl.corliss@finalsite.com"]
-  spec.homepage    = "https://github.com/finalsite/advanced_connection"
-  spec.summary     = "Provides advanced connection options for rails connection pools"
-  spec.description = "Adds idle connection management, statement pooling, and other advanced connection features"
-  spec.license     = "MIT"
+  spec.authors     = ['Carl P. Corliss']
+  spec.email       = ['carl.corliss@finalsite.com']
+  spec.homepage    = 'https://github.com/finalsite/advanced_connection'
+  spec.summary     = 'Provides advanced connection options for rails connection pools'
+  spec.description = 'Adds idle connection management, statement pooling, and other advanced connection features'
+  spec.license     = 'MIT'
 
   spec.files = `git ls-files`.split($/)
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   # eventually support this:
   # spec.required_engine_version = {
@@ -24,27 +24,27 @@ Gem::Specification.new do |spec|
   #   :jruby    => '~> 1.7',
   # }
 
-  spec.add_runtime_dependency "rails",         "~> 4.1"
-  spec.add_runtime_dependency "activerecord",  "~> 4.1"
-  spec.add_runtime_dependency "activesupport", "~> 4.1"
+  spec.add_runtime_dependency 'rails',         '~> 4.1'
+  spec.add_runtime_dependency 'activerecord',  '~> 4.1'
+  spec.add_runtime_dependency 'activesupport', '~> 4.1'
 
-  spec.add_development_dependency "rake",      '~> 10.5.0'
-  spec.add_development_dependency "rack",      '~> 1.6.4'
-  spec.add_development_dependency "rspec",     '~> 3.4.0'
-  spec.add_development_dependency "rspec-its", '~> 1.2.0'
-  spec.add_development_dependency "rspec-collection_matchers", '~> 1.1.2'
+  spec.add_development_dependency 'rake',      '~> 10.5.0'
+  spec.add_development_dependency 'rack',      '~> 1.6.4'
+  spec.add_development_dependency 'rspec',     '~> 3.4.0'
+  spec.add_development_dependency 'rspec-its', '~> 1.2.0'
+  spec.add_development_dependency 'rspec-collection_matchers', '~> 1.1.2'
 
   # optional dependencies
   if RUBY_ENGINE == 'jruby'
-    spec.add_development_dependency "activerecord-jdbcpostgresql-adapter", "~> 1.3.19"
+    spec.add_development_dependency 'activerecord-jdbcpostgresql-adapter', '~> 1.3.19'
+    spec.add_development_dependency 'puma', '~> 3.4.0'
   else
-    spec.add_development_dependency "pg",      "~> 0.18.4"
-    spec.add_development_dependency "pry",     '~> 0.10.3'
-    spec.add_development_dependency "pry-nav", '~> 0.2.4'
+    spec.add_development_dependency 'pg',      '~> 0.18.4'
+    spec.add_development_dependency 'pry',     '~> 0.10.3'
+    spec.add_development_dependency 'pry-nav', '~> 0.2.4'
   end
 
-  spec.add_development_dependency "guard-rspec", '~> 4.6.4'
-  spec.add_development_dependency "coveralls",   '~> 0.8.13'
+  spec.add_development_dependency 'guard-rspec', '~> 4.6.4'
+  spec.add_development_dependency 'coveralls',   '~> 0.8.13'
   spec.add_development_dependency 'rabbitt-githooks', '~> 1.6.0'
-  spec.add_development_dependency 'copyright-header', '~> 1.0.15'
 end

data/lib/advanced_connection/active_record_ext/abstract_adapter.rb

@@ -44,5 +44,9 @@ module AdvancedConnection::ActiveRecordExt
     def instance_age
       (Time.now - @instantiated_at).to_f
     end
+
+    def idle_time
+      (in_use? ? 0.0 : Time.now - @last_checked_in).to_f
+    end
   end
 end

data/lib/advanced_connection/active_record_ext/connection_pool/idle_manager.rb

@@ -1,4 +1,4 @@
-#
+
 # Copyright (C) 2016 Finalsite, LLC
 # Copyright (C) 2016 Carl P. Corliss <carl.corliss@finalsite.com>
 #
@@ -32,13 +32,48 @@ module AdvancedConnection::ActiveRecordExt
 
         class IdleManager
           attr_accessor :interval
-          attr_reader :thread
+          attr_reader :thread, :logger
           private :thread
 
           def initialize(pool, interval)
             @pool     = pool
             @interval = interval.to_i
             @thread   = nil
+            @logger   = ActiveSupport::Logger.new(Rails.root.join('log', 'idle_manager.log'))
+            @logger.level = Rails.logger.level
+          end
+
+          def log_info(format, *args)
+            @logger.info(format("#{idle_stats} #{format}", *args))
+          end
+
+          def log_debug(format, *args)
+            @logger.debug(format("#{idle_stats} #{format}", *args))
+          end
+
+          def log_warn(format, *args)
+            @logger.debug(format("#{idle_stats} #{format}", *args))
+          end
+
+          def dump_stats
+            if (stats_dump = Rails.root.join('tmp', 'dump-idle-stats.txt')).exist?
+              log_info "Dumping statistics"
+              id_size = self.object_id.to_s.size
+              @logger.info(format("%3s: %#{id_size}s\t%9s\t%9s", 'IDX', 'OID', 'AGE', 'IDLE'))
+              @pool.idle_connections.each_with_index do |connection, index|
+                @logger.info(format("%3d: %#{id_size}d\t%9d\t%9d",
+                                    index, connection.object_id, connection.instance_age, connection.idle_time))
+              end
+              !!(stats_dump.unlink rescue true)
+            end
+          end
+
+          def idle_stats
+            stats = @pool.pool_statistics
+            format(
+              "[#{Time.now}] IdleManager (Actv:%d,Avail:%d,Idle:%d,Total:%d):",
+              stats.active, stats.available, stats.idle, stats.total,
+            )
           end
 
           def status
@@ -63,19 +98,23 @@ module AdvancedConnection::ActiveRecordExt
             return unless @interval > 0
 
             @thread ||= Thread.new(@pool, @interval) { |pool, interval|
-              pool.send(:idle_info, "starting idle manager; running every #{interval} seconds")
+              log_info("starting idle manager; running every #{interval} seconds")
 
               loop do
                 sleep interval
 
                 begin
                   start = Time.now
-                  pool.send(:idle_debug, "beginning idle connection cleanup")
+                  dump_stats
+
+                  log_debug("beginning idle connection cleanup")
                   pool.remove_idle_connections
-                  pool.send(:idle_debug, "beginning idle connection warmup")
+
+                  log_debug("beginning idle connection warmup")
                   pool.create_idle_connections
+
                   finish = (Time.now - start).round(6)
-                  pool.send(:idle_debug, "finished idle connection tasks in #{finish} seconds; next run in #{pool.max_idle_time} seconds")
+                  log_info("finished idle connection tasks in #{finish} seconds; next run in #{interval} seconds")
                 rescue => e
                   Rails.logger.error "#{e.class.name}: #{e.message}"
                   e.backtrace.each { |line| Rails.logger.error line }
@@ -94,6 +133,7 @@ module AdvancedConnection::ActiveRecordExt
           when :prefer_older   then Queues::OldAgeBiased.new
           when :prefer_younger then Queues::YoungAgeBiased.new
           when :lifo, :stack   then Queues::Stack.new
+          when :fifo, :queue   then Queues::FIFO.new
           else
             Rails.logger.warn "Unknown queue_type #{queue_type.inspect} - using standard FIFO instead"
             Queues::FIFO.new
@@ -151,7 +191,7 @@ module AdvancedConnection::ActiveRecordExt
 
       def checkin_with_last_checked_in(conn)
         conn.last_checked_in = Time.now
-        idle_debug "checking in connection #{conn.object_id} at #{conn.last_checked_in}"
+        idle_manager.debug "checking in connection #{conn.object_id} at #{conn.last_checked_in}"
         checkin_without_last_checked_in(conn)
       end
 
@@ -213,7 +253,7 @@ module AdvancedConnection::ActiveRecordExt
 
         return unless slots >= count
 
-        idle_info "Warming up #{count} connection#{count > 1 ? 's' : ''}"
+        idle_manager.log_info "Warming up #{count} connection#{count > 1 ? 's' : ''}"
         synchronize do
           count.times {
             conn = checkout_new_connection
@@ -242,27 +282,36 @@ module AdvancedConnection::ActiveRecordExt
 
       def remove_idle_connections
         # don't attempt to remove idle connections if we have threads waiting
-        return if @available.num_waiting > 0
+        if @available.num_waiting > 0
+          idle_manager.log_warn "Cannot reap while threads actively waiting on db connections"
+          return
+        end
 
         idle_conns = idle_connections
         idle_count = idle_conns.size
 
-        return unless idle_count > max_idle_connections
+        unless idle_count > max_idle_connections
+          idle_manager.log_warn "idle count (#{idle_count}) does not exceed max idle connections (#{max_idle_connections}); skipping reap."
+          return
+        end
 
         cull_count = (idle_count - max_idle_connections)
 
         culled = 0
         idle_conns.each_with_index do |conn, idx|
-          last_ci = (Time.now - conn.last_checked_in).to_f
           if idx < cull_count
-            culled += remove_connection(conn) ? 1 : 0
-            idle_info "culled connection ##{idx} id##{conn.object_id} - age:#{conn.instance_age} last_checkin:#{last_ci}"
+            if remove_connection(conn)
+              culled += 1
+              idle_manager.log_info "culled connection ##{idx} id##{conn.object_id} - age:#{conn.instance_age.to_i} idle_time:#{conn.idle_time.to_i}"
+            else
+              idle_manager.log_info "kept connection ##{idx} id##{conn.object_id} - age:#{conn.instance_age.to_i} idle_time:#{conn.idle_time.to_i}"
+            end
           else
-            idle_info "kept connection ##{idx} id##{conn.object_id} - age:#{conn.instance_age} last_checkin:#{last_ci}"
+            idle_manager.log_info "kept connection ##{idx} id##{conn.object_id} - age:#{conn.instance_age.to_i} idle_time:#{conn.idle_time.to_i}"
           end
         end
 
-        idle_info "culled %d connections" % culled
+        idle_manager.log_info "culled %d connections" % culled
       end
 
     private
@@ -275,23 +324,6 @@ module AdvancedConnection::ActiveRecordExt
         end
         true
       end
-
-      def idle_message(format, *args)
-        stats = pool_statistics
-        format(
-          "IdleManager (Actv:%d,Avail:%d,Idle:%d,Total:%d): #{format}",
-          stats.active, stats.available, stats.idle, stats.total,
-          *args
-        )
-      end
-
-      def idle_debug(format, *args)
-        Rails.logger.debug idle_message(format, *args)
-      end
-
-      def idle_info(format, *args)
-        Rails.logger.info idle_message(format, *args)
-      end
     end
   end
 end

data/lib/advanced_connection/active_record_ext/connection_pool/queues.rb

@@ -46,13 +46,13 @@ module AdvancedConnection::ActiveRecordExt
 
       class YoungAgeBiased < AgeSorted
         def remove
-          @queue.pop
+          @queue.shift
         end
       end
 
       class OldAgeBiased < AgeSorted
         def remove
-          @queue.shift
+          @queue.pop
         end
       end
     end

data/lib/advanced_connection/config.rb

@@ -45,7 +45,7 @@ module AdvancedConnection
       min_idle_connections:           0,
       max_idle_connections:           ::Float::INFINITY,
       max_idle_time:                  0,
-      idle_check_interval:            0,
+      idle_check_interval:            nil,
       callbacks:                      ActiveSupport::OrderedOptions.new
     ).freeze unless defined? DEFAULT_CONFIG
 

data/lib/advanced_connection/version.rb

@@ -22,7 +22,7 @@
 module AdvancedConnection
   MAJOR = 0
   MINOR = 5
-  PATCH = 12
+  PATCH = 13
 
   VERSION     = "%d.%d.%d" % [ MAJOR, MINOR, PATCH ]
   GEM_VERSION = Gem::Version.new(VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: advanced_connection
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Carl P. Corliss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: copyright-header
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.15
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.15
 description: Adds idle connection management, statement pooling, and other advanced
   connection features
 email: