sidecloq 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94794800b2fa833deb47bb60355f500c4a5d8ab50587a02e2aa4c18b569acec1
-  data.tar.gz: '09df019367202996965b4ac2c7666c319a93659d32ca38b33bf5cda58a6cada6'
+  metadata.gz: 391595a334f67b866a31fdee2e0c0c1c7d3c2de6e9009825c7e473e1a89171df
+  data.tar.gz: 44991afad3f26e97d70b22a8861641ad9b1619ec83c51c63c62ef8ff2a1ae723
 SHA512:
-  metadata.gz: d371cea011f259e7fe5d19a8cf419cab1af559f6522674ecd60037d13aa174bc6e74d360788f0c3ef1568ba5861319d0a50781ba9455cf2d11d950635f811d12
-  data.tar.gz: f4c61720493f0fc6ae8d517008d2178684cf4e8fcb3c01003425928d0cdf199b07980107f7fac5d82496fa370586a6e420dd26e88119c58d5b2fb8f483ee3519
+  metadata.gz: 2f7df231b254bf0915229a4de09a3df0fdc9d4e90cc8e8855c2f7b157a300c3636fe10669413066fe13ed86d5194ba6b416a74c628a31a9da70ace3e575ff7ad
+  data.tar.gz: 05c6c316b6f4258b46385d3d950915e80f02a21d2dcd57549b35d11d696bb75579488b5873530044fb4bb8e65835526095fdf908f79c40e6022826ed1b2be49f

data/.travis.yml

@@ -1,3 +1,4 @@
+dist: bionic
 language: ruby
 sudo: false
 cache: bundler
@@ -11,14 +12,9 @@ rvm:
   - 2.4.5
   - 2.5.3
   - 2.6.1
-  - ruby-head
-  - jruby-9.0.4.0
   - jruby-9.1.17.0
-  - jruby-head
-  - rbx-2.11
-  - rbx-3.84
+  - jruby-9.2.5.0
 env:
-  - "sidekiq=stable"
   - "sidekiq=3.5.4"
   - "sidekiq=4.2.10"
   - "sidekiq=5.1.3"
@@ -26,28 +22,21 @@ env:
   - "sidekiq=master"
 matrix:
   allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-2.11
-    - rvm: rbx-3.84
     - env: "sidekiq=master"
   exclude:
     # sidekiq 5 does not support < ruby 2.2.2
     - rvm: 2.0.0
       env: sidekiq=master
-    - rvm: 2.0.0
-      env: sidekiq=stable
     - rvm: 2.0.0
       env: sidekiq=5.1.3
     - rvm: 2.0.0
       env: sidekiq=5.2.5
     - rvm: 2.1.10
       env: sidekiq=master
-    - rvm: 2.1.10
-      env: sidekiq=stable
     - rvm: 2.1.10
       env: sidekiq=5.1.3
     - rvm: 2.1.10
       env: sidekiq=5.2.5
+  fast_finish: true
 after_success:
   - bundle exec codeclimate-test-reporter

data/Gemfile

@@ -10,7 +10,6 @@ end
 # https://github.com/sinatra/sinatra/blob/master/Gemfile
 sidekiq_dep =
   case ENV['sidekiq']
-  when 'stable', nil then nil
   when /(\d+\.)+\d+/ then "~> " + ENV['sidekiq'].sub("sidekiq-", '')
   else {github: 'mperham/sidekiq', branch: ENV['sidekiq']}
   end

data/README.md

@@ -44,7 +44,7 @@ Add this line to your application's Gemfile:
 gem 'sidecloq'
 ```
 
-Tested on MRI > 2, JRuby and Rubinius.  Basically, if you can run
+Tested on MRI > 2 and JRuby 9k.  Basically, if you can run
 Sidekiq, you can run Sidecloq.  Note that Sidekiq >= 5 does not support
 MRI ruby < 2.2.2.
 

data/lib/sidecloq/locker.rb

@@ -13,28 +13,47 @@ module Sidecloq
       @check_interval = options[:check_interval] || 15
       @lock_manager = Redlock::Client.new([@redis])
       @obtained_lock = Concurrent::Event.new
+      @check_task = nil
       @lock = nil
+      @stopping = false
+      @in_with_lock = false
     end
 
     # blocks until lock is obtained, then yields
     def with_lock
+      @in_with_lock = true
+
       start
       @obtained_lock.wait
-      yield
+
+      yield if locked?
+
       stop
+      @stopping = false
+
+      @in_with_lock = false
     end
 
     def stop(timeout = nil)
-      return unless @check_task
+      return if @stopping
+
+      @stopping = true
 
-      logger.debug('Stopping locker check task')
-      @check_task.shutdown
-      @check_task.wait_for_termination(timeout)
-      logger.debug('Stopped locker check task')
+      if @check_task
+        logger.debug('Stopping locker check task')
+        @check_task.shutdown
+        @check_task.wait_for_termination(timeout)
+        logger.debug('Stopped locker check task')
+      end
+
+      # release the lock in case someone is blocked on with_lock
+      @obtained_lock.set
+
+      @stopping = false unless @in_with_lock
     end
 
     def locked?
-      @obtained_lock.set?
+      !@stopping && @lock && @obtained_lock.set?
     end
 
     private unless $TESTING
@@ -48,6 +67,9 @@ module Sidecloq
         try_to_get_or_refresh_lock
       end
       @check_task.execute
+
+      # return the check task, to help with tests
+      @check_task
     end
 
     def try_to_get_or_refresh_lock

data/lib/sidecloq/runner.rb

@@ -25,11 +25,9 @@ module Sidecloq
 
     def stop(timeout = nil)
       logger.debug('Stopping runner')
-      if @locker.locked?
-        @scheduler.stop(timeout)
-        @locker.stop(timeout)
-      end
-      @thread.join if @thread
+      @scheduler.stop(timeout)
+      @locker.stop(timeout)
+      @thread.join(timeout) if @thread
       logger.debug('Stopped runner')
     end
 

data/lib/sidecloq/scheduler.rb

@@ -7,10 +7,12 @@ module Sidecloq
       @schedule = schedule
       @options = options
       @loaded = Concurrent::Event.new
+      @running = false
     end
 
     # run queues jobs per their schedules, blocking forever
     def run
+      @running = true
       logger.info('Loading schedules into redis')
       sync_with_redis
       logger.info('Starting scheduler')
@@ -19,9 +21,12 @@ module Sidecloq
     end
 
     def stop(timeout = nil)
+      return unless @running
       logger.info("Stopping scheduler (timeout: #{timeout})")
       rufus.shutdown(:kill)
       rufus.thread.join(timeout)
+      @running = false
+
       logger.info('Stopped scheduler')
     end
 

data/lib/sidecloq/version.rb

@@ -1,3 +1,3 @@
 module Sidecloq
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidecloq
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Matt Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-03 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq