diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-11-19 10:18:44 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-11-19 10:18:44 -0800 |
| commit | 99432cbcfbcec1f4f260a503d2d9d0142bc34f5a (patch) | |
| tree | e9523f2113988d374f0234fe98d0751dca279ce1 | |
| parent | 18a646c38808c645773a4ea3eb2ddebb273cf6bc (diff) | |
| download | gitlab-ce-preserve-second-parameter-new-note-worker.tar.gz | |
Preserve optional second parameter in NewNoteWorker jobspreserve-second-parameter-new-note-worker
If there are any old or retries in the Sidekiq queue, NewNoteWorker
will fail with the error:
wrong number of arguments (given 2, expected 1)
This change allows the optional second argument to be used
to preserve backwards compatibility. It can be removed later.
Closes #24678
| -rw-r--r-- | app/workers/new_note_worker.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/new_note_worker.rb b/app/workers/new_note_worker.rb index 66574d0fd01..926162b8c53 100644 --- a/app/workers/new_note_worker.rb +++ b/app/workers/new_note_worker.rb @@ -2,7 +2,9 @@ class NewNoteWorker include Sidekiq::Worker include DedicatedSidekiqQueue - def perform(note_id) + # Keep extra parameter to preserve backwards compatibility with + # old `NewNoteWorker` jobs (can remove later) + def perform(note_id, _params = {}) if note = Note.find_by(id: note_id) NotificationService.new.new_note(note) Notes::PostProcessService.new(note).execute |