lib/sidekiq.rb in sidekiq-5.0.0 vs lib/sidekiq.rb in sidekiq-5.0.1

- old
+ new

@@ -147,11 +147,12 @@ def self.default_server_middleware Middleware::Chain.new end def self.default_worker_options=(hash) - @default_worker_options = default_worker_options.merge(hash.stringify_keys) + # stringify + @default_worker_options = default_worker_options.merge(Hash[hash.map{|k, v| [k.to_s, v]}]) end def self.default_worker_options defined?(@default_worker_options) ? @default_worker_options : DEFAULT_WORKER_OPTIONS end @@ -220,9 +221,8 @@ # raised in workers that have not finished within the hard # timeout limit. This is needed to rollback db transactions, # otherwise Ruby's Thread#kill will commit. See #377. # DO NOT RESCUE THIS ERROR IN YOUR WORKERS class Shutdown < Interrupt; end - end require 'sidekiq/rails' if defined?(::Rails::Engine)