advanced_connection 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d9bda6b436e364dda841af17bf2b2915d3e261d
-  data.tar.gz: 6248d54d405b47f4bb26d8c38d3a102b71d78342
+  metadata.gz: 177ee27347e2d89c59e62a37e9c4277581a98a3e
+  data.tar.gz: 5f986bcfddcf5aae95f198c9b83f9ca03f81d94f
 SHA512:
-  metadata.gz: 4ad06944f5895088cdf3c3b0edb8fea2f329a8f77b9a77ec5a0f76fe73fa6ca7d63f61c99d6227fa7a1302e817efc780b0cb97c126604976c3f1c7caf125db4c
-  data.tar.gz: 7d7ae267de0aa0973ea4ad381c01b8ce9ec07ee65f1be3dcb65672ed79e46e1ca2389e97559d12b7d99c15ea5edd1d27a07aaf700a4bf1f64a6ebfb802ed76b4
+  metadata.gz: 65cc5f19566474a2f05244f5025a2f14046a15a07a0069ee0cf1134cdfd76ad73299544cd0676c2eb8ed8b7b56a4758616fa1989095374e7e774b608927ff2cd
+  data.tar.gz: fc36d53db639a0c22f2723421e924147b898226a917590ca97df10a2d26e243cca13adf798ded82c3b5abece1d683ba2a197187411d22fd670b24e161790beec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    advanced_connection (0.5.13)
+    advanced_connection (0.5.14)
       activerecord (~> 4.1)
       activesupport (~> 4.1)
       rails (~> 4.1)
@@ -48,6 +48,7 @@ GEM
     builder (3.2.2)
     coderay (1.1.1)
     concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.1-java)
     coveralls (0.8.13)
       json (~> 1.8)
       simplecov (~> 0.11.0)
@@ -96,6 +97,7 @@ GEM
     nenv (0.3.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.7.2-java)
     notiffany (0.0.8)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -184,6 +186,7 @@ GEM
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)

data/lib/advanced_connection/active_record_ext/abstract_adapter.rb

@@ -48,5 +48,31 @@ module AdvancedConnection::ActiveRecordExt
     def idle_time
       (in_use? ? 0.0 : Time.now - @last_checked_in).to_f
     end
+
+    def idle?
+      idle_time > pool.max_idle_time
+    end
+
+    def <=>(other)
+      case pool.queue_type
+        when :prefer_younger then
+          # when prefering younger, we sort oldest->youngest
+          # this ensures that older connections will be culled
+          # during #remove_idle_connections()
+          -(instance_age <=> other.instance_age)
+        when :prefer_older then
+          # when prefering older, we sort youngest->oldest
+          # this ensures that younger connections will be culled
+          # during #remove_idle_connections()
+          (instance_age <=> other.instance_age)
+        else
+          # with fifo / lifo queues, we only care about the
+          # last time a given connection was used (inferred
+          # by when it was last checked into the pool).
+          # This ensures that the longer idling connections
+          # will be culled.
+          -(last_checked_in <=> other.last_checked_in)
+      end
+    end
   end
 end

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

@@ -142,6 +142,10 @@ module AdvancedConnection::ActiveRecordExt
         @idle_manager = IdleManager.new(self, idle_check_interval).tap(&:start)
       end
 
+      #
+      ## SETINGS
+      #
+
       def queue_type
         @queue_type ||= spec.config.fetch(:queue_type,
                                           AdvancedConnection.connection_pool_queue_type).to_s.downcase.to_sym
@@ -191,74 +195,27 @@ module AdvancedConnection::ActiveRecordExt
 
       def checkin_with_last_checked_in(conn)
         conn.last_checked_in = Time.now
-        idle_manager.debug "checking in connection #{conn.object_id} at #{conn.last_checked_in}"
+        idle_manager.log_debug "checking in connection #{conn.object_id} at #{conn.last_checked_in}"
         checkin_without_last_checked_in(conn)
       end
 
-      def active_connections
-        @connections.select(&:in_use?)
-      end
-
-      def available_connections
-        @connections.reject(&:in_use?)
-      end
-
       def idle_connections
-        available_connections.select do |conn|
-          (Time.now - conn.last_checked_in).to_f > max_idle_time
-        end.sort { |a, b|
-          case queue_type
-            when :prefer_younger then
-              # when prefering younger, we sort oldest->youngest
-              # this ensures that older connections will be culled
-              # during #remove_idle_connections()
-              -(a.instance_age <=> b.instance_age)
-            when :prefer_older then
-              # when prefering older, we sort youngest->oldest
-              # this ensures that younger connections will be culled
-              # during #remove_idle_connections()
-              (a.instance_age <=> b.instance_age)
-            else
-              # with fifo / lifo queues, we only care about the
-              # last time a given connection was used (inferred
-              # by when it was last checked into the pool).
-              # This ensures that the longer idling connections
-              # will be culled.
-              -(a.last_checked_in <=> b.last_checked_in)
-          end
-        }
+        synchronize { @connections.select(&:idle?).sort }
       end
 
       def pool_statistics
-        idle = active = available = 0
         synchronize do
-          idle      = idle_connections.size
-          active    = active_connections.size
-          available = available_connections.size
-        end
-        total = active + available
-
-        ActiveSupport::OrderedOptions.new.merge(
-          total:     total,
-          idle:      idle,
-          active:    active,
-          available: available
-        )
-      end
-
-      def warmup_connections(count = nil)
-        count ||= warmup_connection_count
-        slots = connection_limit - @connections.size
-        count = slots if slots < count
-
-        return unless slots >= count
-
-        idle_manager.log_info "Warming up #{count} connection#{count > 1 ? 's' : ''}"
-        synchronize do
-          count.times {
-            conn = checkout_new_connection
-            @available.add conn
-          }
+          total     = @connections.size
+          idle      = @connections.count(&:idle?)
+          active    = @connections.count(&:in_use?)
+          available = total - active
+
+          ActiveSupport::OrderedOptions.new.merge(
+            total:     total,
+            idle:      idle,
+            active:    active,
+            available: available
+          )
         end
       end
 
@@ -280,6 +237,22 @@ module AdvancedConnection::ActiveRecordExt
         warmup_connections(create_count)
       end
 
+      def warmup_connections(count = nil)
+        count ||= warmup_connection_count
+        slots = connection_limit - @connections.size
+        count = slots if slots < count
+
+        return unless slots >= count
+
+        idle_manager.log_info "Warming up #{count} connection#{count > 1 ? 's' : ''}"
+        synchronize do
+          count.times {
+            conn = checkout_new_connection
+            @available.add conn
+          }
+        end
+      end
+
       def remove_idle_connections
         # don't attempt to remove idle connections if we have threads waiting
         if @available.num_waiting > 0

data/lib/advanced_connection/version.rb

@@ -22,7 +22,7 @@
 module AdvancedConnection
   MAJOR = 0
   MINOR = 5
-  PATCH = 13
+  PATCH = 14
 
   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.13
+  version: 0.5.14
 platform: ruby
 authors:
 - Carl P. Corliss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails