Skip to content

Commit 12a1796

Browse files
committed
Revert the blocking call change
This caused the connection to hang without returning any work. Letting this one for later. --- Change-type: feature
1 parent 12e902b commit 12a1796

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/sidekiq-queue-pause.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ def retrieve_work
5353
end
5454

5555
def retrieve_work_for_queues(qcmd)
56-
queue, job = redis { |conn| conn.blocking_call(conn.read_timeout + TIMEOUT, "brpop", *qcmd, TIMEOUT) }
56+
#queue, job = redis { |conn| conn.blocking_call(conn.read_timeout + TIMEOUT, "brpop", *qcmd, TIMEOUT) }
57+
queue, job = redis { |conn| conn.brpop(*qcmd) }
5758
UnitOfWork.new(queue, job, config) if queue
5859
end
5960

spec/sidekiq-queue-pause_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
allow(pausing_fetch).to receive(:redis).and_yield(conn)
4545

4646
expect(described_class::UnitOfWork).to receive(:new).with(queue, job.to_json, config).and_call_original
47-
expect(conn).to receive(:blocking_call).with(conn.read_timeout + described_class::TIMEOUT, "brpop", queue, described_class::TIMEOUT)
47+
#expect(conn).to receive(:blocking_call).with(conn.read_timeout + described_class::TIMEOUT, "brpop", queue, described_class::TIMEOUT)
48+
expect(conn).to receive(:brpop).with(queue)
4849
expect(conn).to receive(:rpush).with(queue, job.to_json)
4950

5051
unit_of_work = pausing_fetch.retrieve_work_for_queues(queue)

0 commit comments

Comments
 (0)