Remove daemonization code, let god/monit handle it.

Use a 'default' queue for simplicity.

lib/sidekiq/cli.rb

@@ -16,8 +16,6 @@ module Sidekiq
     FOREVER = 2_000_000_000
 
     def run
-      write_pid if @options[:daemon]
-
       ::Sidekiq::Client.redis = ConnectionPool.new { Redis.connect(:url => @options[:server]) }
       server = Sidekiq::Server.new(@options[:server], @options)
       begin
@@ -34,18 +32,13 @@ module Sidekiq
     private
 
     def boot_rails
-      ENV['RAILS_ENV'] = @options[:environment] || 'production'
+      ENV['RAILS_ENV'] = @options[:environment]
       require File.expand_path("#{@options[:rails]}/config/environment.rb")
       Rails.application.eager_load!
     end
 
     def validate!
       $DEBUG = @options[:verbose]
-      if @options[:queues].size == 0
-        log "========== Please configure at least one queue to process =========="
-        log @parser
-        exit(1)
-      end
 
       if !File.exist?("#{@options[:rails]}/config/boot.rb")
         log "========== Please point sidekiq to a Rails 3 application =========="
@@ -56,12 +49,10 @@ module Sidekiq
 
     def parse_options(argv=ARGV)
       @options = {
-        :daemon => false,
         :verbose => false,
-        :queues => [],
+        :queues => ['default'],
         :worker_count => 25,
         :server => 'redis://localhost:6379/0',
-        :pidfile => nil,
         :rails => '.',
         :environment => 'production',
       }
@@ -74,14 +65,6 @@ module Sidekiq
           end
         end
 
-        o.on "-d", "Daemonize" do |arg|
-          @options[:daemon] = arg
-        end
-
-        o.on "--pidfile PATH", "Use PATH as a pidfile" do |arg|
-          @options[:pidfile] = arg
-        end
-
         o.on "-v", "--verbose", "Print more verbose output" do
           @options[:verbose] = true
         end
@@ -103,7 +86,7 @@ module Sidekiq
         end
       end
 
-      @parser.banner = "sidekiq -q foo -q bar <more options>"
+      @parser.banner = "sidekiq [options]"
       @parser.on_tail "-h", "--help", "Show help" do
         log @parser
         exit 1
@@ -111,13 +94,5 @@ module Sidekiq
       @parser.parse!(argv)
     end
 
-    def write_pid
-      if path = @options[:pidfile]
-        File.open(path, "w") do |f|
-          f.puts Process.pid
-        end
-      end
-    end
-
   end
 end

lib/sidekiq/client.rb

@@ -14,8 +14,8 @@ module Sidekiq
 
     # Example usage:
     # Sidekiq::Client.push('my_queue', 'class' => MyWorker, 'args' => ['foo', 1, :bat => 'bar'])
-    def self.push(queue, item)
-      raise(ArgumentError, "Message must be a Hash of the form: { :class => SomeClass, :args => ['bob', 1, :foo => 'bar'] }") unless item.is_a?(Hash)
+    def self.push(queue='default', item)
+      raise(ArgumentError, "Message must be a Hash of the form: { 'class' => SomeClass, 'args' => ['bob', 1, :foo => 'bar'] }") unless item.is_a?(Hash)
       raise(ArgumentError, "Message must include a class and set of arguments: #{item.inspect}") if !item['class'] || !item['args']
 
       item['class'] = item['class'].to_s if !item['class'].is_a?(String)
@@ -28,14 +28,15 @@ module Sidekiq
     #
     #   Sidekiq::Client.enqueue(MyWorker, 'foo', 1, :bat => 'bar')
     #
-    # where MyWorker has defined:
+    # Messages are enqueued to the 'default' queue.  Optionally,
+    # MyWorker can define a queue class method:
     #
     #   def self.queue
     #     'my_queue'
     #   end
     #
     def self.enqueue(klass, *args)
-      queue = (klass.respond_to?(:queue) && klass.queue) || klass.instance_variable_get(:@queue) || raise(ArgumentError, "Cannot determine queue to use")
+      queue = (klass.respond_to?(:queue) && klass.queue) || 'default'
       push(queue, { 'class' => klass.name, 'args' => args })
     end
   end