summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-04-29 17:17:31 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-04-29 17:17:31 +0000
commitbb733375d1f7868cb713e4fd92c6f52956650b92 (patch)
tree17a2e353fbb4571732a1c050a74fa6edf50424f7
parent3610d23d2da0ca10ae6a099f614d4bf2daafe958 (diff)
parent6229a458519e246694d277a89e9a5e3fea0adb9f (diff)
downloadgitlab-ce-bb733375d1f7868cb713e4fd92c6f52956650b92.tar.gz
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
-rw-r--r--lib/gitlab/sidekiq_config.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/sidekiq_config.rb b/lib/gitlab/sidekiq_config.rb
index fb303e3fb0c..c102fa14cfc 100644
--- a/lib/gitlab/sidekiq_config.rb
+++ b/lib/gitlab/sidekiq_config.rb
@@ -7,7 +7,7 @@ module Gitlab
module SidekiqConfig
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.
def self.worker_queues(rails_path = Rails.root.to_s)
@worker_queues ||= {}
@@ -19,7 +19,7 @@ module Gitlab
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.
def self.expand_queues(queues, all_queues = self.worker_queues)
return [] if queues.empty?