Various cleanups

Changes.md

@@ -1,7 +1,9 @@
 HEAD
 -----------
 
-- Gracefully rescue any errors thrown in the Fetcher and sleep for 1 second before retrying.
+- Better network error handling when fetching jobs from Redis.
+  Sidekiq will retry once per second until it can re-establish
+  a connection.
 
 1.1.2
 -----------

lib/sidekiq/fetch.rb

@@ -39,8 +39,8 @@ module Sidekiq
             after(0) { fetch }
           end
         rescue => ex
-          logger.error("Error while fetching messages: #{ex}")
-          logger.error(ex.backtrace.join("\n"))
+          logger.error("Error fetching message: #{ex}")
+          logger.error(ex.backtrace.first)
           sleep(TIMEOUT)
           after(0) { fetch }
         end

lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

lib/sidekiq/worker.rb

@@ -29,11 +29,6 @@ module Sidekiq
         Sidekiq::Client.push('class' => self, 'args' => args)
       end
 
-      def queue(name)
-        puts "DEPRECATED: `queue :name` is now `sidekiq_options :queue => :name`"
-        Sidekiq::Client.queue_mappings[self.name] = name.to_s
-      end
-
       ##
       # Allows customization for this type of Worker.
       # Legal options:
@@ -46,7 +41,7 @@ module Sidekiq
       end
 
       def get_sidekiq_options # :nodoc:
-        @sidekiq_options || { 'unique' => true, 'retry' => true, 'queue' => 'default' }
+        defined?(@sidekiq_options) ? @sidekiq_options : { 'unique' => true, 'retry' => true, 'queue' => 'default' }
       end
 
       def stringify_keys(hash) # :nodoc: