Revert "FEATURE: upgrade sidekiq to version 4.0"

This reverts commit af93a1d94c.

We need to wait a bit to clean up our internal API usage.
This commit is contained in:
Sam 2015-12-31 16:35:02 +11:00
parent af93a1d94c
commit af91d6f35b
2 changed files with 53 additions and 8 deletions

View file

@ -37,10 +37,9 @@ end
gem 'mail' gem 'mail'
gem 'mime-types', require: 'mime/types/columnar' gem 'mime-types', require: 'mime/types/columnar'
#gem 'redis-rails'
gem 'hiredis' gem 'hiredis'
gem 'redis', require: ["redis", "redis/connection/hiredis"] gem 'redis', require: ["redis", "redis/connection/hiredis"]
# namspace is needed for sidekiq web
gem 'redis-namespace'
gem 'active_model_serializers', '~> 0.8.3' gem 'active_model_serializers', '~> 0.8.3'

View file

@ -63,9 +63,49 @@ GEM
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
builder (3.2.2) builder (3.2.2)
byebug (6.0.2) byebug (6.0.2)
celluloid (0.17.1.2)
bundler
celluloid-essentials
celluloid-extras
celluloid-fsm
celluloid-pool
celluloid-supervision
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-essentials (0.20.2.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-extras (0.20.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-fsm (0.20.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-pool (0.20.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-supervision (0.20.1.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
certified (1.0.0) certified (1.0.0)
coderay (1.1.0) coderay (1.1.0)
concurrent-ruby (1.0.0)
connection_pool (2.2.0) connection_pool (2.2.0)
crass (1.0.2) crass (1.0.2)
daemons (1.2.3) daemons (1.2.3)
@ -77,6 +117,7 @@ GEM
docile (1.1.5) docile (1.1.5)
domain_name (0.5.25) domain_name (0.5.25)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
dotenv (2.0.2)
ember-data-source (1.0.0.beta.16.1) ember-data-source (1.0.0.beta.16.1)
ember-source (~> 1.8) ember-source (~> 1.8)
ember-handlebars-template (0.1.5) ember-handlebars-template (0.1.5)
@ -124,6 +165,7 @@ GEM
highline (1.7.7) highline (1.7.7)
hike (1.2.3) hike (1.2.3)
hiredis (0.6.0) hiredis (0.6.0)
hitimes (1.2.3)
htmlentities (4.3.4) htmlentities (4.3.4)
http-cookie (1.0.2) http-cookie (1.0.2)
domain_name (~> 0.5) domain_name (~> 0.5)
@ -173,6 +215,7 @@ GEM
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
mustache (1.0.2) mustache (1.0.2)
nenv (0.2.0)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.6.7.1) nokogiri (1.6.7.1)
mini_portile2 (~> 2.0.0.rc2) mini_portile2 (~> 2.0.0.rc2)
@ -302,6 +345,7 @@ GEM
rspec-html-matchers (0.7.0) rspec-html-matchers (0.7.0)
nokogiri (~> 1) nokogiri (~> 1)
rspec (~> 3) rspec (~> 3)
rspec-logsplit (0.1.3)
rspec-mocks (3.2.1) rspec-mocks (3.2.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0) rspec-support (~> 3.2.0)
@ -338,13 +382,14 @@ GEM
shoulda-context (1.2.1) shoulda-context (1.2.1)
shoulda-matchers (2.7.0) shoulda-matchers (2.7.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
sidekiq (4.0.1) sidekiq (3.5.0)
concurrent-ruby (~> 1.0) celluloid (~> 0.17.0)
connection_pool (~> 2.2, >= 2.2.0) connection_pool (~> 2.2, >= 2.2.0)
json (~> 1.0) json (~> 1.0)
redis (~> 3.2, >= 3.2.1) redis (~> 3.2, >= 3.2.1)
sidekiq-statistic (1.2.0) redis-namespace (~> 1.5, >= 1.5.2)
sidekiq (>= 3.3.4, < 5) sidekiq-statistic (1.1.0)
sidekiq (~> 3.3, >= 3.3.4)
simple-rss (1.3.1) simple-rss (1.3.1)
simplecov (0.10.0) simplecov (0.10.0)
docile (~> 1.1.0) docile (~> 1.1.0)
@ -382,6 +427,8 @@ GEM
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
timecop (0.8.0) timecop (0.8.0)
timers (4.1.1)
hitimes
trollop (2.1.1) trollop (2.1.1)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
@ -466,7 +513,6 @@ DEPENDENCIES
rb-inotify (~> 0.9) rb-inotify (~> 0.9)
rbtrace rbtrace
redis redis
redis-namespace
rest-client rest-client
rinku rinku
rmmseg-cpp rmmseg-cpp