with_connection 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/active_record/fiber_patches/log_subscriber.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class FiberedMonitor
+      class LogSubscriber < ActiveSupport::LogSubscriber
+        def wait(event)
+          return unless logger && logger.debug?
+          logger.debug "waited " + (" (%.1fms)" % event.duration) + " for a #{event.payload[:resource]}"
+        end
+      end
+    end
+  end
+end
+ActiveRecord::ConnectionAdapters::FiberedMonitor::LogSubscriber.attach_to :connection_pool

data/lib/active_record/fiber_patches.rb

@@ -17,15 +17,17 @@ module ActiveRecord
         end
 
         def wait(timeout)
-          t = timeout || 5
-          fiber = Fiber.current
-          x = EM::Timer.new(t) do
-            @queue.delete(fiber)
-            fiber.resume(false)
-          end
-          @queue << fiber
-          Fiber.yield.tap do
-            x.cancel
+          ActiveSupport::Notifications.instrument("wait.connection_pool", :resource => self.name) do |payload|
+            t = timeout || 5
+            fiber = Fiber.current
+            x = EM::Timer.new(t) do
+              @queue.delete(fiber)
+              fiber.resume(false)
+            end
+            @queue << fiber
+            Fiber.yield.tap do
+              x.cancel
+            end
           end
         end
 

data/lib/with_connection/connection_pool.rb

@@ -5,8 +5,8 @@ module WithConnection
     attr_reader :name
 
     def initialize(name, spec)
-      super spec
       @name = name
+      super spec
       @disable_warning = !! spec.config[:disable_warning]
       @debug_with_connection = !! spec.config[:debug_with_connection]
       ConnectionManagement.connection_pools << self
@@ -26,7 +26,12 @@ module WithConnection
       if @debug_with_connection && ! @using_with_connection
         Rails.logger.warn "#{name} not using with_connection, backtrace: #{caller.inspect}"
       end
-      checkout_without_debug
+
+      begin
+        checkout_without_debug
+      rescue ActiveRecord::ConnectionTimeoutError => e
+        raise ActiveRecord::ConnectionTimeoutError, "could not obtain a #{name} connection#{" within #{@timeout} seconds" if @timeout}.  The max pool size is currently #{@size}; consider increasing it."
+      end
     end
     alias_method_chain :checkout, :debug
 
@@ -35,32 +40,6 @@ module WithConnection
       release_connection
     end
 
-    # copied directly from the ActiveRecord just so I could change the error message
-    def checkout
-      # Checkout an available connection
-      @connection_mutex.synchronize do
-        loop do
-          conn = if @checked_out.size < @connections.size
-                   checkout_existing_connection
-                 elsif @connections.size < @size
-                   checkout_new_connection
-                 end
-          return conn if conn
-
-          @queue.wait(@timeout)
-
-          if(@checked_out.size < @connections.size)
-            next
-          else
-            clear_stale_cached_connections!
-            if @size == @checked_out.size
-              raise ActiveRecord::ConnectionTimeoutError, "could not obtain a #{name} connection#{" within #{@timeout} seconds" if @timeout}.  The max pool size is currently #{@size}; consider increasing it."
-            end
-          end
-
-        end
-      end
-    end
 
     private
     def new_connection

data/with_connection.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "with_connection"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Youch"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/active_record/fiber_patches.rb",
+    "lib/active_record/fiber_patches/log_subscriber.rb",
     "lib/active_support/cache/features/adapter_methods.rb",
     "lib/active_support/cache/memcache_connection_pool.rb",
     "lib/with_connection.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_connection
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -92,6 +92,7 @@ files:
 - Rakefile
 - VERSION
 - lib/active_record/fiber_patches.rb
+- lib/active_record/fiber_patches/log_subscriber.rb
 - lib/active_support/cache/features/adapter_methods.rb
 - lib/active_support/cache/memcache_connection_pool.rb
 - lib/with_connection.rb
@@ -112,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1872296297786812773
+      hash: 2081270842344130397
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: