Skip to content

Commit

Permalink
fix: Always schedule to specific queue
Browse files Browse the repository at this point in the history
  • Loading branch information
bibendi committed Apr 24, 2017
1 parent 26f7955 commit ffa3563
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
13 changes: 12 additions & 1 deletion lib/resque/integration/unique.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def unique?

# Метод вызывает resque-scheduler чтобы поставить задание в текущую очередь
def scheduled(queue, klass, *args)
klass.constantize.enqueue(*args)
klass.constantize.enqueue_to(queue, *args)
end

# Метод вызывает resque-retry когда ставить отложенное задание
Expand Down Expand Up @@ -167,6 +167,17 @@ def enqueue_with_check(*args) #:nodoc:
enqueue_without_check(*args)
end

def enqueue_to(queue, *args)
meta = enqueued?(*args)
return meta if meta.present?

meta = ::Resque::Plugins::Meta::Metadata.new('meta_id' => meta_id(args), 'job_class' => to_s)
meta.save

Resque.enqueue_to(queue, self, meta.meta_id, *args)
meta
end

private
# Remove lock for job with given +args+
def unlock(*args)
Expand Down
18 changes: 17 additions & 1 deletion spec/resque/integration/unique_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,22 @@ class JobEnqueueTest
JobEnqueueTest.should be_enqueued(1)
end

it 'returns new meta when job is enqueued to specific queue' do
meta = JobEnqueueTest.enqueue_to(:fast, 1)
meta.should be_a Resque::Plugins::Meta::Metadata

expect(JobEnqueueTest.enqueued?(1)).to_not be_nil
expect(Resque.size(:fast)).to eq 1
end

it 'returns new meta when job is scheduled' do
meta = JobEnqueueTest.scheduled(:fast, 'JobEnqueueTest', 1)
meta.should be_a Resque::Plugins::Meta::Metadata

expect(JobEnqueueTest.enqueued?(1)).to_not be_nil
expect(Resque.size(:fast)).to eq 1
end

it 'returns the same meta if job already in queue' do
meta1 = JobEnqueueTest.enqueue(2)
meta2 = JobEnqueueTest.enqueue(2)
Expand Down Expand Up @@ -110,4 +126,4 @@ def self.execute(x)

worker.join
end
end
end

0 comments on commit ffa3563

Please sign in to comment.