diff options
Diffstat (limited to 'lib/gitlab/sidekiq_config/worker.rb')
| -rw-r--r-- | lib/gitlab/sidekiq_config/worker.rb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/gitlab/sidekiq_config/worker.rb b/lib/gitlab/sidekiq_config/worker.rb index aea4209f631..a343573440f 100644 --- a/lib/gitlab/sidekiq_config/worker.rb +++ b/lib/gitlab/sidekiq_config/worker.rb @@ -6,9 +6,11 @@ module Gitlab include Comparable attr_reader :klass - delegate :feature_category_not_owned?, :get_feature_category, :get_sidekiq_options, - :get_tags, :get_urgency, :get_weight, :get_worker_resource_boundary, - :idempotent?, :queue, :queue_namespace, :worker_has_external_dependencies?, + + delegate :feature_category_not_owned?, :generated_queue_name, :get_feature_category, + :get_sidekiq_options, :get_tags, :get_urgency, :get_weight, + :get_worker_resource_boundary, :idempotent?, :queue_namespace, + :worker_has_external_dependencies?, to: :klass def initialize(klass, ee:) @@ -35,7 +37,7 @@ module Gitlab # Put namespaced queues first def to_sort - [queue_namespace ? 0 : 1, queue] + [queue_namespace ? 0 : 1, generated_queue_name] end # YAML representation @@ -45,7 +47,7 @@ module Gitlab def to_yaml { - name: queue, + name: generated_queue_name, worker_name: klass.name, feature_category: get_feature_category, has_external_dependencies: worker_has_external_dependencies?, @@ -62,7 +64,7 @@ module Gitlab end def queue_and_weight - [queue, get_weight] + [generated_queue_name, get_weight] end def retries |