diff options
author | Jonne Haß <me@mrzyx.de> | 2012-09-13 00:17:14 +0400 |
---|---|---|
committer | Jonne Haß <me@mrzyx.de> | 2012-09-13 00:17:14 +0400 |
commit | 70a9218ea544f86409e1310f5f4d56e814636714 (patch) | |
tree | 7e24cb48b9242a87e0e7e42aaad2dfb01de9136c /config/initializers | |
parent | 98c9862b1987a627cfa48b1de89be92d34388bbc (diff) |
add thread_safe true to redis initialization because resque does it too now
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/resque.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config/initializers/resque.rb b/config/initializers/resque.rb index 3fe2995ca..b1141191a 100644 --- a/config/initializers/resque.rb +++ b/config/initializers/resque.rb @@ -5,11 +5,16 @@ Resque::Plugins::Timeout.timeout = 300 if !AppConfig.single_process_mode? if redis_to_go = ENV["REDISTOGO_URL"] uri = URI.parse(redis_to_go) - Resque.redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password) + redis_options = { :host => uri.host, :port => uri.port, + :passsword => uri.password } elsif ENV['RAILS_ENV']== 'integration2' - Resque.redis = Redis.new(:host => 'localhost', :port => 6380) + redis_options = { :host => 'localhost', :port => 6380 } elsif AppConfig[:redis_url] - Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379) + redis_options = { :url => AppConfig[:redis_url], :port => 6379 } + end + + if redis_options + Resque.redis = Redis.new(redis_options.merge(:thread_safe => true)) end end |