diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-18 15:07:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-18 15:07:35 +0300 |
commit | 00cfeb7c25bdbd460efb83ad846cb924e73ee150 (patch) | |
tree | 944cb1af2640f1958efe878de969844ef578cbef /vendor | |
parent | 92de2642b384f7d6ac3bf3c1f0862b067306c9be (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/gems/sidekiq-reliable-fetch/lib/sidekiq/base_reliable_fetch.rb | 1 | ||||
-rw-r--r-- | vendor/gems/sidekiq-reliable-fetch/spec/base_reliable_fetch_spec.rb | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/vendor/gems/sidekiq-reliable-fetch/lib/sidekiq/base_reliable_fetch.rb b/vendor/gems/sidekiq-reliable-fetch/lib/sidekiq/base_reliable_fetch.rb index 006aad87abe..e8ee6d7df45 100644 --- a/vendor/gems/sidekiq-reliable-fetch/lib/sidekiq/base_reliable_fetch.rb +++ b/vendor/gems/sidekiq-reliable-fetch/lib/sidekiq/base_reliable_fetch.rb @@ -179,6 +179,7 @@ module Sidekiq Sidekiq.logger.info( message: "Pushed job #{msg['jid']} back to queue #{queue}", jid: msg['jid'], + class: msg['class'], queue: queue ) end diff --git a/vendor/gems/sidekiq-reliable-fetch/spec/base_reliable_fetch_spec.rb b/vendor/gems/sidekiq-reliable-fetch/spec/base_reliable_fetch_spec.rb index 32e62925aaf..990d699e2f8 100644 --- a/vendor/gems/sidekiq-reliable-fetch/spec/base_reliable_fetch_spec.rb +++ b/vendor/gems/sidekiq-reliable-fetch/spec/base_reliable_fetch_spec.rb @@ -5,7 +5,7 @@ require 'sidekiq/reliable_fetch' require 'sidekiq/semi_reliable_fetch' describe Sidekiq::BaseReliableFetch do - let(:job) { Sidekiq.dump_json(class: 'Bob', args: [1, 2, 'foo']) } + let(:job) { Sidekiq.dump_json(class: 'Bob', args: [1, 2, 'foo'], jid: 55) } before { Sidekiq.redis(&:flushdb) } @@ -47,6 +47,16 @@ describe Sidekiq::BaseReliableFetch do it 'requeues the bulk' do uow = described_class::UnitOfWork jobs = [ uow.new('queue:foo', job), uow.new('queue:foo', job), uow.new('queue:bar', job) ] + + jobs.map(&:queue).each do |q| + expect(Sidekiq.logger).to receive(:info).with( + message: "Pushed job 55 back to queue #{q}", + jid: 55, + class: 'Bob', + queue: q + ) + end + described_class.new(options).bulk_requeue(jobs, nil) expect(queue1.size).to eq 2 |