kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

Refactor Sidekiq::CLI to remove a redundant .empty? method call (#4552)

Browse source
This commit is contained in:
Manoj M J 2020-05-06 01:27:21 +05:30 • committed by GitHub
parent d8191fc169
commit 316a281d7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Changes.md
View file

@ -9,6 +9,7 @@ Unreleased
- Ensure `Rack::ContentLength` is loaded as middleware for correct Web UI responses [#4541]
- Avoid exception dumping SSL store in Redis connection logging [#4532]
- Better error messages in Sidekiq::Client [#4549]
- Refactor `Sidekiq::CLI` to remove a redundant `.empty?` method call [#4552]
6.0.7
---------

2
lib/sidekiq/cli.rb
View file

@ -228,7 +228,7 @@ module Sidekiq
opts = parse_config(opts[:config_file]).merge(opts) if opts[:config_file]
# set defaults
opts[:queues] = ["default"] if opts[:queues].nil? || opts[:queues].empty?
opts[:queues] = ["default"] if opts[:queues].nil?
opts[:strict] = true if opts[:strict].nil?
opts[:concurrency] = Integer(ENV["RAILS_MAX_THREADS"]) if opts[:concurrency].nil? && ENV["RAILS_MAX_THREADS"]

16
test/test_cli.rb
View file

@ -117,10 +117,20 @@ describe Sidekiq::CLI do
end
describe 'when queues are empty' do
it "sets 'default' queue" do
subject.parse(%w[sidekiq -r ./test/fake_env.rb])
describe 'when no queues are specified via -q' do
it "sets 'default' queue" do
subject.parse(%w[sidekiq -r ./test/fake_env.rb])
assert_equal ['default'], Sidekiq.options[:queues]
assert_equal ['default'], Sidekiq.options[:queues]
end
end
describe 'when no queues are specified via the config file' do
it "sets 'default' queue" do
subject.parse(%w[sidekiq -C ./test/config_empty.yml -r ./test/fake_env.rb])
assert_equal ['default'], Sidekiq.options[:queues]
end
end
end
end