Skip to content

Commit 692ea42

Browse files
authored
Merge pull request #1 from FlavourSys/feature/sidekiq4
Add support for sidekiq 4
2 parents 4a67e7f + d447fcc commit 692ea42

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

lib/sidekiq-queue-pause.rb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
require 'celluloid'
1+
begin
2+
require 'celluloid'
3+
rescue LoadError
4+
# Sidekiq 4.2+
5+
end
26
require 'sidekiq'
37
require 'sidekiq/fetch'
48

@@ -48,7 +52,7 @@ def retrieve_work
4852
if qcmd.size > 1
4953
retrieve_work_for_queues qcmd
5054
else
51-
sleep(Sidekiq::QueuePause.retry_after || Sidekiq::Fetcher::TIMEOUT)
55+
sleep(Sidekiq::QueuePause.retry_after || Sidekiq::BasicFetch::TIMEOUT)
5256
nil
5357
end
5458
end
@@ -61,7 +65,7 @@ def retrieve_work_for_queues(qcmd)
6165
def unpaused_queues_cmd
6266
queues = queues_cmd
6367
queues.reject do |q|
64-
q != Sidekiq::Fetcher::TIMEOUT &&
68+
q != Sidekiq::BasicFetch::TIMEOUT &&
6569
Sidekiq::QueuePause.paused?(q.gsub('queue:', ''), Sidekiq::QueuePause.process_key)
6670
end
6771
end

sidekiq-queue-pause.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ Gem::Specification.new do |s|
1111
s.require_paths = ['lib']
1212
s.files = Dir['lib/**/*rb']
1313

14-
s.add_dependency 'sidekiq', '~> 3.1'
14+
s.add_dependency 'sidekiq', '>= 4.0', '< 5.0'
1515
end

0 commit comments

Comments
 (0)