resque-integration 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d09663fd4ebbbdeab2821981399c99d590c4d1f4
-  data.tar.gz: ae7c8f47a7b88af93bf6e5e46577f4e95ae8bcac
+  metadata.gz: b25c3af3ff9bec74ef1a6c8355f622a8d8ed916a
+  data.tar.gz: fcebf66e66aeb96194e051ddf3381efb4b828ed1
 SHA512:
-  metadata.gz: f3029f15b7082a53034862bdb3d0b9aae77784ac95f9dc73c05966abd881d722a7e5285ea8e83f28697a77f8d2dc6266d8c89e82e25b5d65a4c7564d3e105fcf
-  data.tar.gz: 2aebb5a7298e3bb1713f0490e4062445d74f600b657d47e77d27b06d64dfbd34a0e90ca3aa481c4eefb2169fb62f86dd4567835249f2737de02fcbcb328d526b
+  metadata.gz: 151ccd775abb8e8df97149a90cdbe679a87367c6fb4a91b05116b45000f9d6eb83bfc773331c05ed87bfdc7a2eabf80c705c27d889f59c5aaa9408ed8dcb0659
+  data.tar.gz: 0c1a6450232a75c71d18168622b5db0b9069e15ca58befd2f67624e22a705965838887308ad75a198240ec9ff2114e43d69fba479734dac447ef206f1300f4da

data/.drone.yml

@@ -10,7 +10,7 @@ build:
       - COMPOSE_FILE_EXT=drone
       - RUBY_IMAGE_TAG=2.2-latest
     commands:
-      - wrapdocker docker -v
+      - prepare-build
 
       - fetch-images --image abakpress/ruby-app:$RUBY_IMAGE_TAG
       - dip provision

data/CHANGELOG.md

@@ -1,7 +1,14 @@
-# v3.4.1
+# v3.5.0
 
+* 2018-09-06 [49717a5](../../commit/49717a5) - __(Mikhail Nelaev)__ Release 3.5.0 
 * 2018-08-21 [b56dcc8](../../commit/b56dcc8) - __(Artem Napolskih)__ chore: Add automatic publication 
 * 2018-08-15 [5e90b55](../../commit/5e90b55) - __(Artem Napolskih)__ feat: rails 5-x support added 
+* 2018-08-09 [3fa8ce0](../../commit/3fa8ce0) - __(terentev)__ feat: move temporary_exceptions to yml config 
+https://jira.railsc.ru/browse/GOODS-1418
+
+* 2018-08-02 [528feab](../../commit/528feab) - __(terentev)__ feat: adds ability for retry jobs after temporary errors 
+https://jira.railsc.ru/browse/GOODS-1418
+
 * 2018-06-05 [3fc2608](../../commit/3fc2608) - __(Pavel Galkin)__ Release 3.4.0 
 * 2018-06-05 [6ec7a38](../../commit/6ec7a38) - __(Pavel Galkin)__ feat: resque:expire task 
 https://jira.railsc.ru/browse/PC4-21225

data/lib/resque/integration/configuration.rb

@@ -209,6 +209,24 @@ module Resque
         self['resque.god_log_level'] || 'info'
       end
 
+      # Public: Temporary exceptions.
+      #
+      # Examples
+      #
+      #   temporary_exceptions
+      #   # => {PG::TRDeadlockDetected => 20, Net::OpenTimeout => 123}
+      #
+      # Returns Hash.
+      def temporary_exceptions
+        return @temporary_exceptions if defined?(@temporary_exceptions)
+
+        return {} unless self['resque.temporary_exceptions']
+
+        @temporary_exceptions = self['resque.temporary_exceptions'].each_with_object({}) do |(key, value), result|
+          result[key.constantize] = value
+        end
+      end
+
       private
       def load(path)
         if File.exists?(path)

data/lib/resque/integration/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Integration
-    VERSION = '3.4.1'.freeze
+    VERSION = '3.5.0'.freeze
   end
 end

data/lib/resque/integration.rb

@@ -100,33 +100,34 @@ module Resque
 
       # Extend resque-retry.
       #
-      # options - Hash
+      # options - Hash of retry options (default: {}):
+      #           :limit                  - Integer max number of retry attempts (default: 2)
+      #           :delay                  - Integer seconds between retry attempts (default: 60)
+      #           :exceptions             - Array or Hash of specific exceptions to retry (optional)
+      #           :temporary              - boolean retry on temporary exceptions list (default: false)
+      #           :expire_retry_key_after - Integer expire of retry key in redis (default: 3200)
       #
-      #   :limit - Integer (default: 2)
-      #   :delay - Integer (default: 60)
-      #   :expire_retry_key_after - Integer (default: 3200), истечение ключа в секундах. Если
-      #
-      #     t - среднее время выполнения одного джоба
-      #     n - текущее кол-во джобов в очереди
-      #     k - кол-во воркеров
-      #
-      #     то expire_retry_key_after >= t * n / k
-      #
-      #     Иначе ключ истечет, прежде чем джоб отработает.
-      #
-      #
-      # Returns nothing
+      # Returns nothing.
       def retrys(options = {})
-        if unique?
-          raise '`retrys` should be declared higher in code than `unique`'
-        end
+        raise '`retries` should be declared higher in code than `unique`' if unique?
 
         extend Resque::Plugins::Retry
 
         @retry_limit = options.fetch(:limit, 2)
         @retry_delay = options.fetch(:delay, 60)
+
+        @retry_exceptions = options[:exceptions] if options.key? :exceptions
+
+        if options[:temporary]
+          @retry_exceptions = @retry_exceptions && @retry_exceptions.dup || {}
+          @retry_exceptions = @retry_exceptions.product([@retry_delay]).to_h if @retry_exceptions.is_a? Array
+
+          @retry_exceptions.reverse_merge!(Resque.config.temporary_exceptions)
+        end
+
         @expire_retry_key_after = options.fetch(:expire_retry_key_after, 1.hour.seconds)
       end
+      alias retries retrys
 
       # Mark Job as ordered
       def ordered(options = {})

data/spec/internal/app/jobs/retries_argument_error_job.rb

@@ -0,0 +1,10 @@
+class RetriesArgumentErrorJob
+  include Resque::Integration
+
+  retries temporary: true, exceptions: [ArgumentError]
+  queue :test_retries
+
+  def self.execute
+    DummyForRetriesService.call
+  end
+end

data/spec/internal/app/jobs/retries_job.rb

@@ -0,0 +1,10 @@
+class RetriesJob
+  include Resque::Integration
+
+  retries
+  queue :test_retries
+
+  def self.execute
+    DummyForRetriesService.call
+  end
+end

data/spec/internal/app/jobs/retries_standard_error_job.rb

@@ -0,0 +1,10 @@
+class RetriesStandardErrorJob
+  include Resque::Integration
+
+  retries temporary: true, exceptions: [StandardError]
+  queue :test_retries
+
+  def self.execute
+    DummyForRetriesService.call
+  end
+end

data/spec/internal/app/services/dummy_for_retries_service.rb

@@ -0,0 +1,5 @@
+class DummyForRetriesService
+  def self.call
+    raise StandardError.new('test')
+  end
+end

data/spec/resque/integration/configuration_spec.rb

@@ -54,6 +54,18 @@ describe Resque::Integration::Configuration do
       it { expect(config.run_at_exit_hooks?).to be_falsey }
     end
   end
+
+  describe '#temporary_exceptions' do
+    context 'when default' do
+      it { expect(config.temporary_exceptions).to eq({}) }
+    end
+
+    context 'when defined' do
+      let(:config_yaml) { {'resque' => {'temporary_exceptions' => {'StandardError' => 12}}} }
+
+      it { expect(config.temporary_exceptions).to eq(StandardError => 12) }
+    end
+  end
 end
 
 describe Resque::Integration::Configuration::Notifier do

data/spec/resque/integration_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'spec_helper'
 
 RSpec.describe Resque::Integration do
@@ -102,4 +101,35 @@ RSpec.describe Resque::Integration do
       end
     end
   end
+
+  describe 'retries' do
+    context 'with default params' do
+      let(:job) { Resque::Job.new(:test_retries, 'class' => 'RetriesJob', 'args' => ['meta']) }
+
+      it do
+        expect { job.perform }.to raise_error StandardError
+        expect(Resque.delayed_queue_schedule_size).to eq 1
+      end
+    end
+
+    context 'with custom params' do
+      context 'with StandardError in exceptions' do
+        let(:job) { Resque::Job.new(:test_retries, 'class' => 'RetriesStandardErrorJob', 'args' => ['meta']) }
+
+        it do
+          expect { job.perform }.to raise_error StandardError
+          expect(Resque.delayed_queue_schedule_size).to eq 1
+        end
+      end
+
+      context 'with ArgumentError in exceptions' do
+        let(:job) { Resque::Job.new(:test_retries, 'class' => 'RetriesArgumentErrorJob', 'args' => ['meta']) }
+
+        it do
+          expect { job.perform }.to raise_error StandardError
+          expect(Resque.delayed_queue_schedule_size).to eq 0
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-integration
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -349,6 +349,10 @@ files:
 - lib/resque/integration/version.rb
 - resque-integration.gemspec
 - spec/fixtures/resque_queues.yml
+- spec/internal/app/jobs/retries_argument_error_job.rb
+- spec/internal/app/jobs/retries_job.rb
+- spec/internal/app/jobs/retries_standard_error_job.rb
+- spec/internal/app/services/dummy_for_retries_service.rb
 - spec/resque/controllers/jobs_controller_spec.rb
 - spec/resque/integration/configuration_spec.rb
 - spec/resque/integration/continuous_spec.rb
@@ -389,6 +393,10 @@ specification_version: 4
 summary: Seamless integration of resque with resque-progress and resque-lock
 test_files:
 - spec/fixtures/resque_queues.yml
+- spec/internal/app/jobs/retries_argument_error_job.rb
+- spec/internal/app/jobs/retries_job.rb
+- spec/internal/app/jobs/retries_standard_error_job.rb
+- spec/internal/app/services/dummy_for_retries_service.rb
 - spec/resque/controllers/jobs_controller_spec.rb
 - spec/resque/integration/configuration_spec.rb
 - spec/resque/integration/continuous_spec.rb