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

Merge branch 'master' into unique_payloads

This commit is contained in:
Ryan LeCompte 2012-02-07 17:23:34 -08:00
commit 2dbdd694d6

View file

@ -43,6 +43,9 @@ module Sidekiq
end end
def validate! def validate!
@options[:queues] << 'default' if @options[:queues].empty?
@options[:queues].shuffle!
$DEBUG = @options[:verbose] $DEBUG = @options[:verbose]
if !File.exist?("#{@options[:rails]}/config/boot.rb") if !File.exist?("#{@options[:rails]}/config/boot.rb")
@ -55,7 +58,7 @@ module Sidekiq
def parse_options(argv=ARGV) def parse_options(argv=ARGV)
@options = { @options = {
:verbose => false, :verbose => false,
:queues => ['default'], :queues => [],
:processor_count => 25, :processor_count => 25,
:server => ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0', :server => ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0',
:rails => '.', :rails => '.',