codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'update-sidekiq' of git://github.com/nverba/discourse

Browse source 
Conflicts:
	config/initializers/sidekiq.rb
This commit is contained in:
Robin Ward 2013-03-25 10:26:13 -04:00
commit 7c505df6d4
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Gemfile.lock
View file

@ -166,7 +166,7 @@ GEM
execjs (1.4.0)
multi_json (~> 1.0)
fabrication (2.5.4)
facter (1.6.17)
facter (1.6.18)
fakeweb (1.3.0)
faraday (0.8.5)
multipart-post (~> 1.1)
@ -260,7 +260,7 @@ GEM
mixlib-shellout (1.1.0)
mocha (0.10.5)
metaclass (~> 0.0.1)
multi_json (1.7.1)
multi_json (1.7.2)
multipart-post (1.1.5)
mustache (0.99.4)
net-scp (1.0.4)
@ -356,7 +356,7 @@ GEM
rdoc (3.12.1)
json (~> 1.4)
redcarpet (2.2.2)
redis (3.0.2)
redis (3.0.3)
redis-actionpack (3.2.3)
actionpack (~> 3.2.3)
redis-rack (~> 1.4.0)
@ -413,7 +413,7 @@ GEM
shoulda-matchers (1.4.2)
activesupport (>= 3.0.0)
bourne (~> 1.1.2)
sidekiq (2.7.0)
sidekiq (2.8.0)
celluloid (~> 0.12.0)
connection_pool (~> 1.0)
multi_json (~> 1)

9
config/initializers/sidekiq.rb
View file

@ -1,7 +1,4 @@
Sidekiq.configure_server do |config|
config.redis = { url: $redis.url, namespace: 'sidekiq' }
end
sidekiq_redis = { url: $redis.url, namespace: 'sidekiq' }
Sidekiq.configure_client do |config|
config.redis = { url: $redis.url, namespace: 'sidekiq' }
end
Sidekiq.configure_server { |config| config.redis = sidekiq_redis }
Sidekiq.configure_client { |config| config.redis = sidekiq_redis }