Upgrade Celluloid to 0.13, fixes #834

Changes.md

@@ -1,6 +1,7 @@
 2.11.0
 -----------
 
+- Upgrade to Celluloid 0.13. [#834]
 - Remove **timeout** support from `sidekiq_options`.  Ruby's timeout
   is inherently unsafe in a multi-threaded application and was causing
   stability problems for many.  See http://bit.ly/OtYpK

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 gemspec
 
-gem 'celluloid', "~> 0.12.0"
+gem 'celluloid', "~> 0.13.0"
 gem 'slim'
 gem 'sqlite3', :platform => :mri
 

lib/sidekiq/cli.rb

@@ -127,7 +127,7 @@ module Sidekiq
       # Celluloid can't be loaded until after we've daemonized
       # because it spins up threads and creates locks which get
       # into a very bad state if forked.
-      require 'celluloid'
+      require 'celluloid/autostart'
       Celluloid.logger = (options[:verbose] ? Sidekiq.logger : nil)
 
       require 'sidekiq/manager'

sidekiq.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'redis', '~> 3'
   gem.add_dependency                  'redis-namespace'
   gem.add_dependency                  'connection_pool', '~> 1.0'
-  gem.add_dependency                  'celluloid', '~> 0.12.0'
+  gem.add_dependency                  'celluloid', '~> 0.13.0'
   gem.add_dependency                  'multi_json', '~> 1'
   gem.add_development_dependency      'sinatra'
   gem.add_development_dependency      'slim'