action_subscriber 4.1.1-java → 4.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e29f39ca4de3db34bdeac3a4e2f73eb6165995b
-  data.tar.gz: e63de147b4f3e6104e92a9be894ae0d31f8a839f
+  metadata.gz: b80aa9c8134cec3a2430e975fde77a0764035c2d
+  data.tar.gz: 8767dad46211dd3b90d29c40e8a01ecb7e6e2491
 SHA512:
-  metadata.gz: 482d9c48efb799c8db3a33cc6b36cc9fab2a04b569df918b0047a4a2ac151716af37e4da615922e3eea5808f3f563fbba87529628f70bb9e22961975bfeaec17
-  data.tar.gz: 90fd322dd4b232af7f9e63035944a12d38beca4c1e27e3231cd17faa78fa4456710db672107e28a6dbd71fcbdfc16301e4c4afbab396fb85cfbb6957a648fbb3
+  metadata.gz: cabe30d24cc2d4f28f3213f09710b4b60bc84064d328bb64c19b15963d41cf445f0c2022c3e362e2272f3a2e610a0588fa2b4cd83596afae07246d5d96956d68
+  data.tar.gz: 7187ba4237d77c7e04421211348a65cca19edae2eb740c6c04eabd41efa707e225207a0df624a3e5b583f6e61bce6c470db546a5897ab3f4d5578ac75ad100fa

data/action_subscriber.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   else
     spec.add_dependency 'bunny', '>= 1.5.0'
   end
+  spec.add_dependency 'concurrent-ruby'
   spec.add_dependency 'middleware'
   spec.add_dependency 'thor'
 

data/lib/action_subscriber/configuration.rb

@@ -4,6 +4,8 @@ require "action_subscriber/uri"
 module ActionSubscriber
   class Configuration
     attr_accessor :allow_low_priority_methods,
+                  :connection_reaping_interval,
+                  :connection_reaping_timeout_interval,
                   :decoder,
                   :default_exchange,
                   :error_handler,
@@ -28,6 +30,8 @@ module ActionSubscriber
 
     DEFAULTS = {
       :allow_low_priority_methods => false,
+      :connection_reaping_interval => 6,
+      :connection_reaping_timeout_interval => 5,
       :default_exchange => 'events',
       :heartbeat => 5,
       :host => 'localhost',

data/lib/action_subscriber/middleware/active_record/connection_management.rb

@@ -1,16 +1,52 @@
+require "concurrent"
+require "thread"
+
 module ActionSubscriber
   module Middleware
     module ActiveRecord
       class ConnectionManagement
+        START_MUTEX = ::Mutex.new
+
+        def self.start_timed_task!
+          if timed_task_started.false?
+            START_MUTEX.synchronize do
+              return if timed_task_started.true?
+
+              timed_task = ::Concurrent::TimerTask.new(
+                :execution_interval => ::ActionSubscriber.config.connection_reaping_interval,
+                :timeout_interval => ::ActionSubscriber.config.connection_reaping_timeout_interval) do
+
+                ::ActiveRecord::Base.clear_active_connections!
+                end
+
+              timed_task.execute
+              timed_task_started.make_true
+            end
+          end
+        end
+
+        def self.timed_task_started
+          if @timed_task_started.nil?
+            @timed_task_started = ::Concurrent::AtomicBoolean.new(false)
+          end
+
+          @timed_task_started
+        end
+
         def initialize(app)
           @app = app
         end
 
         def call(env)
-          @app.call(env)
-        ensure
-          ::ActiveRecord::Base.clear_active_connections!
+          def call(env)
+            @app.call(env)
+          end
+
+          self.class.start_timed_task!
+          call(env)
         end
+
+        timed_task_started
       end
     end
   end

data/lib/action_subscriber/middleware/active_record/query_cache.rb

@@ -2,26 +2,28 @@ module ActionSubscriber
   module Middleware
     module ActiveRecord
       class QueryCache
+        CURRENT_CONNECTION = "_action_subscriber_query_cache_current_connection".freeze
+
         def initialize(app)
           @app = app
         end
 
         def call(env)
-          enabled = ::ActiveRecord::Base.connection.query_cache_enabled
-          connection_id = ::ActiveRecord::Base.connection_id
-          ::ActiveRecord::Base.connection.enable_query_cache!
+          connection = ::Thread.current[CURRENT_CONNECTION] = ::ActiveRecord::Base.connection
+          enabled = connection.query_cache_enabled
+          connection.enable_query_cache!
 
           @app.call(env)
         ensure
-          restore_query_cache_settings(connection_id, enabled)
+          restore_query_cache_settings(enabled)
         end
 
-      private
+        private
 
-        def restore_query_cache_settings(connection_id, enabled)
-          ::ActiveRecord::Base.connection_id = connection_id
-          ::ActiveRecord::Base.connection.clear_query_cache
-          ::ActiveRecord::Base.connection.disable_query_cache! unless enabled
+        def restore_query_cache_settings(enabled)
+          ::Thread.current[CURRENT_CONNECTION].clear_query_cache
+          ::Thread.current[CURRENT_CONNECTION].disable_query_cache! unless enabled
+          ::Thread.current[CURRENT_CONNECTION] = nil
         end
       end
     end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "4.1.1"
+  VERSION = "4.2.1"
 end

data/spec/lib/action_subscriber/middleware/active_record/connection_management_spec.rb

@@ -9,8 +9,8 @@ describe ActionSubscriber::Middleware::ActiveRecord::ConnectionManagement do
 
   it_behaves_like 'an action subscriber middleware'
 
-  it "clears active connections" do
-    expect(ActiveRecord::Base).to receive(:clear_active_connections!)
+  it "starts async task to clear connections" do
+    expect(ActionSubscriber::Middleware::ActiveRecord::ConnectionManagement).to receive(:start_timed_task!)
     subject.call(env)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.1
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -42,6 +42,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: concurrent-ruby
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: