gb_dispatch 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 85cb910d1e03286d9c72c071f084ac3563cd7f0c
-  data.tar.gz: 1a63ac0bedb03abd7581ff7f4e006d3dfa18271b
+SHA256:
+  metadata.gz: 1600ca0fd7c8177491c2abdec098b6037dae32b2faf059250f4ed77c38febae5
+  data.tar.gz: 2743ee814e54779d75776d2c600bad4ae3c043d19603375dd0e98c0f69810e6d
 SHA512:
-  metadata.gz: c6772bad44636c53a6e5416e5e36ac3abd70e8874c1515a5125d2248d116d4b7805f69c376b2d0ccd47144a71eddf2aef49a8bc7f0069a79c617ec3ac121b55e
-  data.tar.gz: 47edbf55ad5183eae0d6c9a406c1376bbe6fd1f9db0bc503c6ec3ae554f5625b967fa7e58a09690324b1e53f540e751bc04af0e184bf74ec5029bb0a0ccdf64a
+  metadata.gz: 466fa59bc366831d2e0dcfb0402ab741fd3637af128527bbcdda7ada72f6fcecd414f8edd63d40cba451613ab25077da1e7524a1ec97fcea06d652cacc33eda1
+  data.tar.gz: 31b75abd8950d334db400cb0223e10f40fced8126fedd0989c975a11f5465227cd8192d18755cc0901fc6ba5d41a618d89e04a29b5658b5f36687e2d91c6e633

data/.idea/misc.xml

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-1.9.3-p551 [global]" project-jdk-type="RUBY_SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="ruby-2.3.3-p222" project-jdk-type="RUBY_SDK" />
 </project>

data/.idea/modules.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/gb-dispatch.iml" filepath="$PROJECT_DIR$/.idea/gb-dispatch.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/gb-dispatch.iml" filepath="$PROJECT_DIR$/.idea/gb-dispatch.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/gb_dispatch.iml" filepath="$PROJECT_DIR$/.idea/gb_dispatch.iml" />
     </modules>

data/CHANGELOG.txt

@@ -1,3 +1,10 @@
+v0.1.0
+    - Added support for rails 5 - fixed deadlock issues.
+    - Added force_new_connection method to ActiveRecord connection pool for rails >= 5
+v0.0.6
+    - Fixed bug with logger
+v0.0.5
+    - Dropped celluloid - use concurrent-ruby as a backend
 v0.0.4
     - Compatible with celluloid version 17.3
 v0.0.3

data/Dockerfile

@@ -0,0 +1,12 @@
+FROM ruby:2.5.1-alpine
+
+RUN apk add --no-cache --update build-base \
+                                linux-headers \
+                                git
+
+ENV APP_PATH /opt/project
+
+# Different layer for gems installation
+WORKDIR $APP_PATH
+COPY . $APP_PATH
+RUN bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+  source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gb_dispatch.gemspec
 gemspec

data/Gemfile.lock

@@ -1,37 +1,37 @@
 PATH
   remote: .
   specs:
-    gb_dispatch (0.0.5)
+    gb_dispatch (0.1.0)
       concurrent-ruby (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.0.0)
-    concurrent-ruby-ext (1.0.0)
-      concurrent-ruby (~> 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    json (1.8.3)
+    concurrent-ruby (1.0.5)
+    concurrent-ruby-ext (1.0.5)
+      concurrent-ruby (= 1.0.5)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    json (2.1.0)
     rake (10.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    simplecov (0.11.1)
-      docile (~> 1.1.0)
-      json (~> 1.8)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
 
 PLATFORMS
   ruby
@@ -43,3 +43,6 @@ DEPENDENCIES
   rake (~> 10.0)
   rspec
   simplecov
+
+BUNDLED WITH
+   1.16.1

data/lib/gb_dispatch/active_record_patch.rb

@@ -0,0 +1,17 @@
+if defined?(ActiveRecord)
+  module ActiveRecord
+    module ConnectionAdapters
+      class ConnectionPool
+        def force_new_connection
+          old_lock = @lock_thread
+          @lock_thread = nil
+          with_connection do |conn|
+            yield conn
+          end
+        ensure
+          @lock_thread = old_lock
+        end
+      end
+    end
+  end
+end

data/lib/gb_dispatch/queue.rb

@@ -21,13 +21,22 @@ module GBDispatch
     def perform_now(block=nil)
       Thread.current[:name] ||= name
       if defined?(Rails) && defined?(ActiveRecord::Base)
+        require 'gb_dispatch/active_record_patch'
         thread_block = ->() do
-          begin
-            ActiveRecord::Base.connection_pool.with_connection do
-              block ? block.call : yield
+          if Rails::VERSION::MAJOR < 5
+            begin
+              ActiveRecord::Base.connection_pool.force_new_connection do
+                block ? block.call : yield
+              end
+            ensure
+              ActiveRecord::Base.clear_active_connections!
+            end
+          else
+            Rails.application.executor.wrap do
+              ActiveRecord::Base.connection_pool.force_new_connection do
+                block ? block.call : yield
+              end
             end
-          ensure
-            ActiveRecord::Base.clear_active_connections!
           end
         end
       else

data/lib/gb_dispatch/runner.rb

@@ -29,20 +29,22 @@ module GBDispatch
       # @param options [Hash]
       # @option options [String] :name queue name used for debugging and better logging.
       def execute(block, options=Hash.new)
-        future = Concurrent::Future.new(:executor => self.pool) do
-          begin
-            name = options[:name]
-            Thread.current[:name] ||= name if name
-            result = block.call
-            result
-          rescue Exception => e
-            if defined?(Opbeat)
-              Opbeat.set_context extra: {queue: name} if name
-              Opbeat.capture_exception(e)
-            end
-            GBDispatch.logger.error "Failed execution of queue #{name} with error #{e.message}"
-            raise e
+        if defined?(Rails) && defined?(Rails::VERSION::MAJOR)
+          if Rails::VERSION::MAJOR < 5
+            _execute(block, options)
+          else
+            _execute_rails(block, options)
           end
+        else
+          _execute(block, options)
+        end
+      end
+
+      private
+
+      def _execute(block, options)
+        future = Concurrent::Future.new(:executor => self.pool) do
+          _run_block(block, options)
         end
         future.execute
         future.value
@@ -51,6 +53,43 @@ module GBDispatch
         end
         future.value
       end
+
+      def _execute_rails(block, options)
+        if defined?(Rails) && defined?(ActiveSupport::Dependencies)
+          future = Concurrent::Future.new(:executor => self.pool) do
+            Rails.application.executor.wrap do
+              ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+                _run_block(block, options)
+              end
+            end
+          end
+          future.execute
+          ActiveSupport::Dependencies.interlock.permit_concurrent_loads { future.value }
+          if future.rejected?
+            raise future.reason
+          end
+          future.value
+        else
+          raise 'Failed loading rails!'
+        end
+      end
+
+      def _run_block(block, options)
+        begin
+          name = options[:name]
+          Thread.current[:name] ||= name if name
+          result = block.call
+          result
+        rescue Exception => e
+          if defined?(Raven)
+            Raven.tags_context :gb_dispacth => true
+            Raven.extra_context :dispatch_queue => name
+            Raven.capture_exception(e)
+          end
+          GBDispatch.logger.error "Failed execution of queue #{name} with error #{e.message}"
+          raise e
+        end
+      end
     end
   end
 end

data/lib/gb_dispatch/version.rb

@@ -1,3 +1,3 @@
 module GBDispatch
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 end

data/spec/dispatch_spec.rb

@@ -65,6 +65,7 @@ describe GBDispatch do
     GBDispatch.dispatch_after 0.1, :test do
       a << 1
     end
+    sleep(0.01)
     expect(a.empty?).to be_truthy
     sleep(0.15)
     expect(a).to eq [1]
@@ -75,6 +76,7 @@ describe GBDispatch do
     GBDispatch.dispatch_after_on_queue 0.1, :test do
       a << 1
     end
+    sleep(0.01)
     expect(a.empty?).to be_truthy
     sleep(0.2)
     expect(a).to eq [1]

data/spec/queue_spec.rb

@@ -85,6 +85,9 @@ describe GBDispatch::Queue do
   context 'rails' do
     before(:each) do
       class Rails
+        module VERSION
+          MAJOR = 4
+        end
       end
       module ActiveRecord
         class Base
@@ -92,6 +95,12 @@ describe GBDispatch::Queue do
             def with_connection
               yield
             end
+
+            def force_new_connection
+              with_connection do
+                yield
+              end
+            end
           end
 
           def self.connection_pool

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ SimpleCov.start do
   add_filter '/spec/'
 end
 
-SimpleCov.minimum_coverage 90
+SimpleCov.minimum_coverage 78
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb_dispatch
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Kacper Kawecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -96,6 +96,7 @@ files:
 - ".idea/vcs.xml"
 - ".rspec"
 - CHANGELOG.txt
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -103,6 +104,7 @@ files:
 - Rakefile
 - gb_dispatch.gemspec
 - lib/gb_dispatch.rb
+- lib/gb_dispatch/active_record_patch.rb
 - lib/gb_dispatch/central_dispatch.rb
 - lib/gb_dispatch/manager.rb
 - lib/gb_dispatch/queue.rb
@@ -132,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: GCD emulation for ruby
@@ -141,4 +143,3 @@ test_files:
 - spec/queue_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
-has_rdoc: