sidekiq-limit_fetch 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca083933d1ef02f0cc4311954a1a0a8c82c9a0e0
-  data.tar.gz: fb76a0812ae751d02f39aeea371b37a780b6d1d0
+  metadata.gz: e3cffb46d9e10cd316b080cef7fbdee888d65b7a
+  data.tar.gz: 0a944880dee77b36ad0416578c1f8f00058004c5
 SHA512:
-  metadata.gz: 26f18118cbcf8896bf8fdf070438eb42a3f10658e6e413ed2bec88526a474857d38766bbea508b8f00081013a03ebb84eb47c1943ccd04b9150f91e11ee79df7
-  data.tar.gz: db1ac7268dd03b5bc28e72e9b2cef9d68e5cb606f9adb4819add906e0d2b6026d658d56d1595117955e26628eca03f05c5c4db44949f6157cac6e50c47570aa2
+  metadata.gz: e2cb38b4b8b35761c10150975aa0d15396b3c7885d0f02299ef8e7cf977162fcc4145c11b565a404e724ceaebb2d78e9dd392bd834776b846aaf1f5df192128b
+  data.tar.gz: 454b3e24b94f167245a416528d70867c3917dd41fd69669492bb2e47d41aa0d04aba854300da84f8a5e2d706b6e8272ec4dac87a37e44bbe14f67fe6d895022d

data/.travis.yml

@@ -1,7 +1,10 @@
 language: ruby
+before_install:
+- gem install bundler
+- gem update bundler
 rvm:
-  - 2.3
-  - 2.2
-  - jruby
+  - 2.3.1
+  - 2.2.5
+  - jruby-head
 services:
   - redis-server

data/lib/sidekiq/limit_fetch.rb

@@ -30,6 +30,13 @@ module Sidekiq::LimitFetch
     Sidekiq::BasicFetch.bulk_requeue(*args)
   end
 
+  def redis_retryable
+    yield
+  rescue Redis::BaseConnectionError
+    sleep 1
+    retry
+  end
+
   private
 
   TIMEOUT = Sidekiq::BasicFetch::TIMEOUT

data/lib/sidekiq/limit_fetch/global/monitor.rb

@@ -10,9 +10,12 @@ module Sidekiq::LimitFetch::Global
     def start!(ttl=HEARTBEAT_TTL, timeout=REFRESH_TIMEOUT)
       Thread.new do
         loop do
-          add_dynamic_queues
-          update_heartbeat ttl
-          invalidate_old_processes
+          Sidekiq::LimitFetch.redis_retryable do
+            add_dynamic_queues
+            update_heartbeat ttl
+            invalidate_old_processes
+          end
+
           sleep timeout
         end
       end

data/lib/sidekiq/limit_fetch/queues.rb

@@ -23,7 +23,10 @@ module Sidekiq::LimitFetch::Queues
   def release_except(full_name)
     queues = restore
     queues.delete full_name[/queue:(.*)/, 1] if full_name
-    selector.release queues, namespace
+
+    Sidekiq::LimitFetch.redis_retryable do
+      selector.release queues, namespace
+    end
   end
 
   def dynamic?

data/lib/sidekiq/limit_fetch/unit_of_work.rb

@@ -2,17 +2,23 @@ module Sidekiq
   class LimitFetch::UnitOfWork < BasicFetch::UnitOfWork
     def initialize(queue, job)
       super
-      Queue[queue_name].increase_busy
+      redis_retryable { Queue[queue_name].increase_busy }
     end
 
     def acknowledge
-      Queue[queue_name].decrease_busy
-      Queue[queue_name].release
+      redis_retryable { Queue[queue_name].decrease_busy }
+      redis_retryable { Queue[queue_name].release }
     end
 
     def requeue
       super
       acknowledge
     end
+
+    private
+
+    def redis_retryable(&block)
+      Sidekiq::LimitFetch.redis_retryable(&block)
+    end
   end
 end

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '3.2.1'
+  gem.version       = '3.3.0'
   gem.license       = 'MIT'
   gem.authors       = 'brainopia'
   gem.email         = 'brainopia@evilmartians.com'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - brainopia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -17,13 +17,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -34,8 +34,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -44,6 +42,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -51,13 +51,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -65,13 +65,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 description: |2
       Sidekiq strategy to restrict number of workers
       which are able to run specified queues simultaneously.
@@ -121,7 +121,7 @@ homepage: https://github.com/brainopia/sidekiq-limit_fetch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,9 +136,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.4
+signing_key:
 specification_version: 4
 summary: Sidekiq strategy to support queue limits
 test_files: