Merge pull request sidekiq#2484 from grosser/grosser/zero

prevent invalid concurrency from causing hard to debug problems
hanchang · Aug 12, 2015 · a7696ef · a7696ef
2 parents a64333b + 8c82a9f
commit a7696ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lib/sidekiq/manager.rb b/lib/sidekiq/manager.rb
@@ -27,6 +27,7 @@ def initialize(condvar, options={})
       logger.debug { options.inspect }
       @options = options
       @count = options[:concurrency] || 25
+      raise ArgumentError, "Concurrency of #{@count} is not supported" if @count < 1
       @done_callback = nil
       @finished = condvar
 

diff --git a/test/test_manager.rb b/test/test_manager.rb
@@ -88,6 +88,11 @@ def new_manager(opts)
       fetcher.verify
     end
 
+    it 'does not support invalid concurrency' do
+      assert_raises(ArgumentError) { new_manager(concurrency: 0) }
+      assert_raises(ArgumentError) { new_manager(concurrency: -1) }
+    end
+
     describe 'heartbeat' do
       before do
         uow = Object.new