diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 03:10:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 03:10:56 +0300 |
| commit | 61a1ecc5e9a8fba5c8cfa37a67905fb71ccf4fd0 (patch) | |
| tree | 86e1e7a6c2aca7582f7819179c5c74f8263991a8 /lib/gitlab/sidekiq_cluster | |
| parent | 58c1969d4a05cd3bf4b0b96da7cbd219d58d6328 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_cluster')
| -rw-r--r-- | lib/gitlab/sidekiq_cluster/cli.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/gitlab/sidekiq_cluster/cli.rb b/lib/gitlab/sidekiq_cluster/cli.rb index 05319ba17a2..3dee257229d 100644 --- a/lib/gitlab/sidekiq_cluster/cli.rb +++ b/lib/gitlab/sidekiq_cluster/cli.rb @@ -57,6 +57,11 @@ module Gitlab worker_queues = SidekiqConfig::CliMethods.worker_queues(@rails_path) queue_groups = argv.map do |queues_or_query_string| + if queues_or_query_string =~ /[\r\n]/ + raise CommandError, + 'The queue arguments cannot contain newlines' + end + next worker_queues if queues_or_query_string == SidekiqConfig::WorkerMatcher::WILDCARD_MATCH # When using the queue query syntax, we treat each queue group |