advanced_connection 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b6cf3c3a0fdeacc8cde74431cd95e8ee086a785
-  data.tar.gz: df3db9850e19c1999b0e219ae8a5670b2c803750
+  metadata.gz: 5388815e17dd8184ac2da77dd66f12dc8f420c89
+  data.tar.gz: 84e79b7bcaa1806c872f25831c0b688843af0bf8
 SHA512:
-  metadata.gz: 268715f2553969f63c9c6b54b17b5c3f1a046fb864f9df865185622b416973d3c749433d9bfab4d803b1e6fe7c984152756e8dfdccbaa5b391b09d6f65e9255b
-  data.tar.gz: b883bc28735538d6f7f095ac362363b357747028cb29c4aeac305c0d8d9aae5550392f715fca0491abb51ae0d4f39f8c6c9592fac44f5b20b135c4e4e064e316
+  metadata.gz: f1f7d22818b463df971f7dde6a17b4f19dcd35c5a048b88863684bf9dbe685e99c8c0a8fdbdd5a044681fd951e779ce0ad06df83dc9e84dab8b251906d8e5024
+  data.tar.gz: c9a8fe419202cca4bce4d552c921cceb53d0e71b7b7ee861391172068d1c4670280d4bcf09ed69ce50500c3adce1369003ee01d2e22d9d4654701eae5de6adae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    advanced_connection (0.5.5)
+    advanced_connection (0.5.6)
       activerecord (~> 4.1)
       activesupport (~> 4.1)
       rails (~> 4.1)

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

@@ -179,7 +179,7 @@ module AdvancedConnection::ActiveRecordExt
           total:     total,
           idle:      idle,
           active:    active,
-          available: available,
+          available: available
         )
       end
 
@@ -188,14 +188,14 @@ module AdvancedConnection::ActiveRecordExt
         slots = connection_limit - @connections.size
         count = slots if slots < count
 
-        if slots >= count
-          idle_info "Warming up #{count} connection#{count > 1 ? 's' : ''}"
-          synchronize do
-            count.times {
-              conn = checkout_new_connection
-              @available.add conn
-            }
-          end
+        return unless slots >= count
+
+        idle_info "Warming up #{count} connection#{count > 1 ? 's' : ''}"
+        synchronize do
+          count.times {
+            conn = checkout_new_connection
+            @available.add conn
+          }
         end
       end
 
@@ -224,22 +224,22 @@ module AdvancedConnection::ActiveRecordExt
         idle_conns = idle_connections
         idle_count = idle_conns.size
 
-        if idle_count > max_idle_connections
-          cull_count = (idle_count - max_idle_connections)
+        return unless 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}"
-            else
-              idle_info "kept connection ##{idx} id##{conn.object_id} - age:#{conn.instance_age} last_checkin:#{last_ci}"
-            end
-          end
+        cull_count = (idle_count - max_idle_connections)
 
-          idle_info "culled %d connections" % culled
+        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}"
+          else
+            idle_info "kept connection ##{idx} id##{conn.object_id} - age:#{conn.instance_age} last_checkin:#{last_ci}"
+          end
         end
+
+        idle_info "culled %d connections" % culled
       end
 
     private

data/lib/advanced_connection/config.rb

@@ -101,6 +101,13 @@ module AdvancedConnection
       @config = DEFAULT_CONFIG.deep_dup
     end
 
+    def can_enable?
+      # don't enable if we're running rake tasks, in particular db: or assets: tasks
+      return false if $0.include? 'rake'
+      return false if ARGV.grep(/^(assets|db):/).any?
+      true
+    end
+
     def loaded!
       @loaded = true
     end

data/lib/advanced_connection/railtie.rb

@@ -23,17 +23,19 @@ module AdvancedConnection
   class Railtie < Rails::Railtie
     config.advanced_connection = ActiveSupport::OrderedOptions.new
 
-    ActiveSupport.on_load(:before_initialize) do
-      ActiveSupport.on_load(:active_record) do
-        # load our intitializer ASAP so we can make use of user defined configuration
-        load Rails.root.join('config', 'initializers', 'advanced_connection.rb')
-        ActiveRecord::Base.send(:include, AdvancedConnection::ActiveRecordExt)
+    if AdvancedConnection.can_enable?
+      ActiveSupport.on_load(:before_initialize) do
+        ActiveSupport.on_load(:active_record) do
+          # load our intitializer ASAP so we can make use of user defined configuration
+          load Rails.root.join('config', 'initializers', 'advanced_connection.rb')
+          ActiveRecord::Base.send(:include, AdvancedConnection::ActiveRecordExt)
+        end
       end
-    end
 
-    config.after_initialize do
-      if AdvancedConnection.enable_idle_connection_manager && AdvancedConnection.warmup_connections
-        ActiveRecord::Base.connection_handler.connection_pool_list.each(&:warmup_connections)
+      config.after_initialize do
+        if AdvancedConnection.enable_idle_connection_manager && AdvancedConnection.warmup_connections
+          ActiveRecord::Base.connection_handler.connection_pool_list.each(&:warmup_connections)
+        end
       end
     end
   end

data/lib/advanced_connection/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advanced_connection
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Carl P. Corliss