Commit bb733375 authored by Robert Speicher's avatar Robert Speicher

Merge branch '6565-move-sidekiq-cluster-ce' into 'master'

Change comments to point to the new path of sidekiq-cluster

See merge request gitlab-org/gitlab-ce!27707
parents 3610d23d 6229a458
...@@ -7,7 +7,7 @@ module Gitlab ...@@ -7,7 +7,7 @@ module Gitlab
module SidekiqConfig module SidekiqConfig
QUEUE_CONFIG_PATHS = %w[app/workers/all_queues.yml ee/app/workers/all_queues.yml].freeze QUEUE_CONFIG_PATHS = %w[app/workers/all_queues.yml ee/app/workers/all_queues.yml].freeze
# This method is called by `bin/sidekiq-cluster` in EE, which runs outside # This method is called by `ee/bin/sidekiq-cluster` in EE, which runs outside
# of bundler/Rails context, so we cannot use any gem or Rails methods. # of bundler/Rails context, so we cannot use any gem or Rails methods.
def self.worker_queues(rails_path = Rails.root.to_s) def self.worker_queues(rails_path = Rails.root.to_s)
@worker_queues ||= {} @worker_queues ||= {}
...@@ -19,7 +19,7 @@ module Gitlab ...@@ -19,7 +19,7 @@ module Gitlab
end end
end end
# This method is called by `bin/sidekiq-cluster` in EE, which runs outside # This method is called by `ee/bin/sidekiq-cluster` in EE, which runs outside
# of bundler/Rails context, so we cannot use any gem or Rails methods. # of bundler/Rails context, so we cannot use any gem or Rails methods.
def self.expand_queues(queues, all_queues = self.worker_queues) def self.expand_queues(queues, all_queues = self.worker_queues)
return [] if queues.empty? return [] if queues.empty?
......
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