Commit bd55acff authored by Igor Drozdov's avatar Igor Drozdov

Merge branch 'allow-job-waiter-keys-in-sidekiq-logs' into 'master'

Allow job waiter keys in Sidekiq logs

See merge request gitlab-org/gitlab!34635
parents df51e59c a431c4d4
...@@ -7,8 +7,8 @@ class AuthorizedProjectsWorker ...@@ -7,8 +7,8 @@ class AuthorizedProjectsWorker
feature_category :authentication_and_authorization feature_category :authentication_and_authorization
urgency :high urgency :high
weight 2 weight 2
idempotent! idempotent!
loggable_arguments 1 # For the job waiter key
# This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore the # This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore the
# visibility of prepended modules. See https://github.com/rspec/rspec-mocks/issues/1231 # visibility of prepended modules. See https://github.com/rspec/rspec-mocks/issues/1231
......
...@@ -8,6 +8,7 @@ class ProjectImportScheduleWorker # rubocop:disable Scalability/IdempotentWorker ...@@ -8,6 +8,7 @@ class ProjectImportScheduleWorker # rubocop:disable Scalability/IdempotentWorker
feature_category :importers feature_category :importers
sidekiq_options retry: false sidekiq_options retry: false
loggable_arguments 1 # For the job waiter key
def perform(project_id) def perform(project_id)
return if Gitlab::Database.read_only? return if Gitlab::Database.read_only?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment